From 60694f0a47cf0379541582d77af659c8cad58154 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Fri, 26 Dec 2025 08:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesPrepareDetailMapper.xml     | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml
index 90964bd4e..ae387eaaa 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml
@@ -219,30 +219,40 @@
 
     <select id="selectPrintPrepareDetailListByOrderCodes" parameterType="com.op.mes.domain.MesPrepareDetail"
             resultType="com.op.mes.domain.MesPrepareDetail">
-        select
-            mp.workorder_name workorderCode,
-            mpd.material_code materialCode,
-            mpd.material_name materialName,
-            mpd.quantity,
-            mpd.unit,
-            mpd.status,
-            mpd.fund_quanlity fundQuanlity,
-            mpd.factory_code factoryCode,
-            mpd.recoil,
-            ow.product_date productDate,
-            ow.prod_line_code prodLineCode,
-            ROW_NUMBER() OVER (ORDER BY mpd.recoil DESC) AS xh
-        from pro_order_workorder ow
-            left join mes_prepare mp on ow.workorder_code = mp.workorder_code
-            left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id
-        where
-            ow.del_flag = '0' and mpd.recoil = '' and mp.del_flag = '0' and mpd.del_flag = '0'
-            and ow.belong_work_order in
-            <foreach item="orderCode" collection="list" open="(" separator="," close=")">
+        SELECT
+            *,
+            ROW_NUMBER ( ) OVER ( ORDER BY materialCode DESC ) AS xh
+        FROM
+        (
+            SELECT
+                mpd.material_code materialCode,
+                mpd.material_name materialName,
+                SUM ( CONVERT ( DECIMAL ( 18, 2 ), mpd.fund_quanlity ) ) quantity,
+                mpd.unit,
+                SUM ( CONVERT ( DECIMAL ( 18, 2 ), mpd.fund_quanlity ) ) fundQuanlity,
+                mpd.factory_code factoryCode,
+                ow.product_date productDate
+            FROM pro_order_workorder ow
+            LEFT JOIN mes_prepare mp ON ow.workorder_code = mp.workorder_code
+            LEFT JOIN mes_prepare_detail mpd ON mp.prepare_id = mpd.prepare_id
+            WHERE
+                ow.del_flag = '0'
+                AND mpd.recoil = ''
+                AND mp.del_flag = '0'
+                AND mpd.del_flag = '0'
+                AND ow.belong_work_order in
+                <foreach item="orderCode" collection="list" open="(" separator="," close=")">
                     #{orderCode}
-            </foreach>
+                </foreach>
+            GROUP BY
+                mpd.material_code,
+                mpd.material_name,
+                mpd.unit,
+                mpd.factory_code,
+                ow.product_date
+        ) t
+        ORDER BY materialCode DESC
 
-        order by mpd.recoil
     </select>
 
 </mapper>