From c1b747a6712d637662809dec1fe8185bb323a08e Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 29 Apr 2025 16:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=BD=AC=E6=8D=A2/=E5=AE=8C?=
 =?UTF-8?q?=E4=BA=A7=E6=B8=85=E7=BA=BF=E7=82=B9=E6=A3=80=E8=A1=A8=E7=AD=89?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesInspectionReportMapper.xml        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
index f850f1891..5b5cb3ff2 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesInspectionReportMapper.xml
@@ -171,10 +171,10 @@
 
     <select id="getProductList" resultMap="MesInspectionReportResult" parameterType="MesInspectionReport">
 	    select
-	      mts.id,
-		  pow.workorder_id,
-          pow.product_name,
-		  pow.product_code
+	        mts.id,
+            MAX(pow.workorder_id) AS workorder_id,
+            MAX(pow.product_name) AS product_name,
+            MAX(pow.product_code) AS product_code
         from mes_table_self mts
         left join pro_order_workorder pow on mts.line_code = pow.workorder_name
 		LEFT JOIN base_shifts_t bst ON pow.shift_id = bst.Shift_Id
@@ -194,10 +194,7 @@
         and mts.line_code = #{lineCode}
         and pow.workorder_name = #{lineCode}
 		group by
-		mts.id,
-		pow.workorder_id,
-        pow.product_name,
-		pow.product_code
+		mts.id
     </select>
 
     <select id="getDataCodeList" resultType ="com.op.mes.domain.ProOrderWorkorder" parameterType="MesInspectionReport">