From 272b52b9e1ab2a5d004107546973a3cd4103e40f Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 12 Jan 2024 14:36:14 +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=B98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/quality/controller/QuaController.java | 1 +
 .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 4 ++--
 .../resources/mapper/quality/QcCheckTaskIncomeMapper.xml   | 5 ++---
 .../resources/mapper/quality/QcCheckTaskProduceMapper.xml  | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
index a08ed161..c0f5a994 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
@@ -185,6 +185,7 @@ public class QuaController extends BaseController {
      */
     @PostMapping(value = "commitCheckResults")
     public AjaxResult commitCheckResults(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
+        DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
         if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
             return error("[List<QcCheckTaskDetail>]不能为空");
         }
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 0d197e74..8d67f647 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
@@ -551,7 +551,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	@Transactional(rollbackFor = Exception.class)
 	public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
 		List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
-		DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+
         Date nowTime = DateUtils.getNowDate();
         String factoryCode = qcCheckTaskIncome.getFactoryCode();
         String updateBy = qcCheckTaskIncome.getUpdateBy();
@@ -655,7 +655,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 				oaR = this.createProduceOA(qcCheckTaskIncome);
 			}else if("product".equals(qcCheckTaskIncome.getTypeCode())) {
 				//TODO;不走OA
-				oaR.put("code","200");
+				oaR.put("code","500");
 			}
 			if(oaR!=null && (oaR.get("code").toString()).equals("200")){
 				/**qc_check_unqualified**/
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 86b2529d..7cf02aa3 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
@@ -51,9 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
 			qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
 			qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality,
-			q.type_code
+			qct.type_code
 		from qc_check_task qct
-		left join qc_check_type q on q.id = qct.check_type
 		<where>
 			<if test="checkNo != null  and checkNo != ''"> and qct.check_no = #{checkNo}</if>
 			<if test="incomeBatchNo != null  and incomeBatchNo != ''"> and qct.income_batch_no = #{incomeBatchNo}</if>
@@ -76,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkTimeStart != null "> and CONVERT(varchar(30),qct.check_time, 120) >= #{checkTimeStart}</if>
 			<if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120)</if>
 			<if test="checkType != null "> and qct.check_type = #{checkType} </if>
-			<if test="typeCode != null "> and q.type_code = #{typeCode} </if>
+			<if test="typeCode != null "> and qct.type_code = #{typeCode} </if>
 		</where>
 	</select>
 
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 396c9db0..f4ed5ecc 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
@@ -354,6 +354,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</where>
 			GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
 			qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120)
-		) t  order by t.order_no,t.createTimeStr desc
+		) t
+		where 1=1
+		<if test="checkType != null ">
+		  and t.check_type = #{checkType}
+		</if>
+		order by t.order_no,t.createTimeStr desc
 	</select>
 </mapper>