From e8970b3f21d91e61458f479c69bdb783d8dcd281 Mon Sep 17 00:00:00 2001
From: ghm <guanhongming@lanju.cn>
Date: Fri, 5 Jun 2026 15:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=A8=E6=A3=80=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/mes/mapper/MesReportWorkMapper.java  | 2 ++
 .../com/op/mes/service/impl/MesReportWorkServiceImpl.java | 2 ++
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
index 34e3f4c37..67718c844 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
@@ -250,6 +250,8 @@ public interface MesReportWorkMapper {
 
     BigDecimal selectWmsProductPut(MesReportWork mesReportWork1);
 
+    String selectQcCheckResult(MesReportWork mesReportWork);
+
     List<Map<String,Object>> selectRecordDnbInstantByTime (Map<String, Object> query);
 
     void updateAttr2AndRspos(MesReportWorkConsume params);
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
index 996469fb8..43a556111 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
@@ -161,6 +161,8 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		for (MesReportWork	mesReportWork1:dtos){
 			BigDecimal	RK=	mesReportWorkMapper.selectWmsProductPut(mesReportWork1);
 			mesReportWork1.setRKquantity(RK);
+			String checkResult = mesReportWorkMapper.selectQcCheckResult(mesReportWork1);
+			mesReportWork1.setCheckResult(checkResult);
 		}
 		return dtos;
 	}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index ebc5032ea..b97691a56 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -1806,6 +1806,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			product_order = #{workorderCodeSap}
 		  AND product_code = #{productCode}
 	</select>
+
+	<select id="selectQcCheckResult" resultType="java.lang.String">
+		SELECT DISTINCT qc_check_task.check_result
+		FROM pro_order_workorder
+		    LEFT JOIN qc_check_task ON pro_order_workorder.workorder_code = qc_check_task.order_no
+		WHERE pro_order_workorder.workorder_code_sap = #{workorderCodeSap}
+		    AND qc_check_task.check_type = 'checkTypeCP'
+	</select>
 	<select id="getProductReason" resultType="com.op.mes.domain.vo.MesDailyReportVos">
 		SELECT
 			remark AS reason,