紧急bug

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -402,8 +402,8 @@
 			qct.check_loc checkLoc,
 		    qct.remark
 		from qc_check_task qct
-				 left join pro_order_workorder pow on pow.workorder_code = qct.order_no
-		where qct.record_id = #{recordId}
+		left join pro_order_workorder pow on pow.workorder_code = qct.order_no
+		where qct.record_id = #{recordId} and pow.del_flag = '0'
 	</select>
     <select id="getCkeckTaskXJList" resultType="com.op.quality.domain.QcCheckTaskIncome">
 		select

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java

@@ -311,7 +311,7 @@ public class SapRouterServiceImpl implements SapRouterService {
             log.error(e.getMessage());
             return R.fail(e.getMessage());
         }
-        return R.ok(successMsg);
+        return R.ok(successMsg.toString());
     }
 }