生产过程检验修改测试

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

@@ -78,4 +78,6 @@ public interface QcCheckUnqualifiedMapper {
 	void updateQualityStatus(QcCheckTaskIncome qcCheckTaskIncome);
 
     List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
+
+	int updateWorkOrderStatus(QcCheckTaskIncome qcCheckTaskIncome);
 }

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

@@ -254,6 +254,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			 qcCheckTaskIncome.setCheckResult(result);
 			 qcCheckTaskIncome.setCheckTime(DateUtils.getNowDate());
 			 n = qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome);
+
+			 /**wms_raw_order_in-->quality_status->**/
+			 qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"0");
+			 qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
 		 }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
 			 QcCheckTaskProduce qcCheckTaskProduce = new QcCheckTaskProduce();
 			 qcCheckTaskProduce.setCheckStatus("2");
@@ -261,6 +265,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			 qcCheckTaskProduce.setCheckResult(result);
 			 qcCheckTaskProduce.setCheckTime(DateUtils.getNowDate());
 			 n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce);
+
+
+			 /**pro_order_workorder-->status->w5**/
+			 qcCheckTaskIncome.setStatus("w5");
+			 qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome);
 		 }else if("product".equals(qcCheckTaskIncome.getTypeCode())){
 			 QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing();
 			 warehousing.setCheckStatus("2");
@@ -283,10 +292,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 		}
 
-		/**wms_raw_order_in-->quality_status->**/
-		qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"0");
-		qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
-
 		return n ;
 	}
 

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

@@ -32,7 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="typeCode != null  and typeCode != ''"> and type_code = #{typeCode}</if>
 			<if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
 			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
-			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
 			 and del_flag = '0'
 		</where>
 		order by create_time

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

@@ -185,6 +185,9 @@ 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>
 
 	<delete id="deleteQcCheckUnqualifiedById" parameterType="String">
 		delete from qc_check_unqualified where id = #{id}