Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java

@@ -79,5 +79,5 @@ public interface QcCheckUnqualifiedMapper {
 
     List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 
-	int updateWorkOrderStatus(QcCheckTaskIncome qcCheckTaskIncome);
+	int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -285,9 +285,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			 n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce);
 
 
-			 /**pro_order_workorder-->status->w5**/
-			 qcCheckTaskIncome.setStatus("w5");
-			 qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome);
+			 /**pro_order_workorder_batch-->qc_status->2**/
+			 qcCheckTaskIncome.setStatus("2");
+			 qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
 		 }else if("product".equals(qcCheckTaskIncome.getTypeCode())){
 			 QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing();
 			 warehousing.setCheckStatus("2");
@@ -413,9 +413,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2");
 			qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
 		}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
-			/**pro_order_workorder-->status->w5**/
-			qcCheckTaskIncome.setStatus("w5");
-			qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome);
+			/**pro_order_workorder_batch-->status->w5**/
+			qcCheckTaskIncome.setStatus("2");
+			qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
 		}else if("product".equals(qcCheckTaskIncome.getTypeCode())){
 
 		}

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

@@ -186,8 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wms_raw_order_in set quality_status = #{checkResult}
         where order_no = #{orderNo}
 	</update>
-	<update id="updateWorkOrderStatus">
-		update pro_order_workorder set status = #{status} where workorder_code_sap = #{orderNo}
+	<update id="updateWorkOrderBatchStatus">
+		update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo}
 	</update>
 
 	<delete id="deleteQcCheckUnqualifiedById" parameterType="String">