From b681252e2f6b17c4347c8c7e439514fe7072bfa0 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 16 Jan 2024 09:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B910?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java  | 5 +++--
 .../resources/mapper/quality/QcCheckTaskIncomeMapper.xml    | 6 +++---
 .../resources/mapper/quality/QcCheckTaskProduceMapper.xml   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index c632782f1..493ca14ea 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -494,7 +494,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			noOkQquality = noOkQquality.add(defect.getNoOkQuality());
 		}
 		qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数
-
+		qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy());
+		qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
 		qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
 		/**qc_check_task**/
 		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
@@ -536,7 +537,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			/**pro_order_workorder_batch-->status->w5**/
 			qcCheckTaskIncome.setStatus("2");
 			qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
-			if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
+			if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){
 
 				QcCheckTaskIncome recheck = new QcCheckTaskIncome();
 				recheck.setOldBelongTo(belongId);
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 51daaa555..7b66cc706 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -272,8 +272,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update qc_check_task
 		set
 			check_status = #{checkStatus},
-		    check_man_code = #{updateBy},
-		    check_man_name =#{updateByName},
+		    check_man_code = #{checkManCode},
+		    check_man_name =#{checkManName},
 			<if test="checkTime != null">check_time = #{checkTime},</if>
 			<if test="sampleQuality != null">sample_quality = #{sampleQuality},</if>
 			<if test="noOkQuality != null">noOk_quality = #{noOkQuality},</if>
@@ -352,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			qct.quality,
 			t.remark
 		from qc_check_task qct
-				 left join(
+		left join(
 			SELECT
 				belong_to,
 				STUFF(
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
index 01c7860d6..61b02ebda 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			id,check_name checkName
 		from qc_check_type
 		where  del_flag='0'
-		<if test="typeCode != null">and type_code = #{typeCode} </if>
+		<if test="typeCode != null and typeCode!=''">and type_code = #{typeCode} </if>
 	</select>
     <select id="getOrderWorks" resultType="com.op.quality.domain.QcCheckTaskProduce">
 		select qct.factory_code factoryCode,