From 31a9b49ab5eb0067c7c49954b8296b8d011f5f38 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 5 Dec 2025 16:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A3=85=E7=AE=B1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ecss/EcssCommonMapper.xml          | 107 +++++++++++++-----
 1 file changed, 81 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
index ab195940..1062fb2d 100644
--- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml
+++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
@@ -32,41 +32,96 @@
 	</select>
 
 	<select id="searchEcssCoDelNotifyDetail"   resultType="java.util.Map">
-		select a.*,#{cmcInvoice} as cmcInvoice,#{shippingMode} as shippingMode,#{destination} as destination,
-		CONVERT(varchar(10), #{readyDate}, 120) AS readyDate,a.salesOrder as salesOrder,
-		CASE WHEN a.modifyFlag = 1 THEN '是' ELSE '否' END AS modifyFlagString
+		select
+		a.*,
+		#{cmcInvoice} as cmcInvoice,
+		#{shippingMode} as shippingMode,
+		#{destination} as destination,
+		CONVERT(varchar(10), #{readyDate}, 120) AS readyDate,
+		a.salesOrder as salesOrder,
+		CASE
+		WHEN a.modifyFlag = 1
+		THEN '改单' +
+		CASE WHEN h.modify_count IS NOT NULL THEN '(' + CAST(h.modify_count AS VARCHAR(10)) + ')' ELSE '' END
+		ELSE '否'
+		END AS modifyFlagString
 		from ecss_CoDelNotifydetail a
+		LEFT JOIN ecss_CoDelNotifyHeader h
+		ON a.site = h.site and a.bu_no = h.bu_no
+		AND a.delNo = h.delNo
 		<where>
-			And a.site = #{site}
+			AND a.site = #{site}
 			AND a.delNo = #{delNo}
 		</where>
 		order by a.item_no
 	</select>
 
 	<select id="searchCoDelPalletData" resultType="java.util.Map">
-		SELECT t.salesOrder, t.customerPO, t.part_no, t.qty,
-			   CASE WHEN t.rn = 1 THEN t.box_qty ELSE NULL END AS boxQty,
-			   t.rolls, t.pn,
-			   CASE WHEN t.rn = 1 THEN t.grossWeight ELSE NULL END AS grossWeight,
-			   CASE WHEN t.rn = 1 THEN t.netWeight ELSE NULL END AS netWeight,
-			   t.cmcInvoice, t.shippingMode, t.destination,
-			   t.cmc_comment, t.readyDate, t.modifyFlagString
+		SELECT
+			t.salesOrder,
+			t.customerPO,
+			t.part_no,
+			t.qty,
+			CASE WHEN t.rn = 1 THEN t.box_qty ELSE NULL END AS boxQty,
+			isnull(t.rolls,0) AS rolls,
+			t.pn,
+			CASE WHEN t.rn = 1 THEN t.grossWeight ELSE NULL END AS grossWeight,
+			CASE WHEN t.rn = 1 THEN t.netWeight ELSE NULL END AS netWeight,
+			t.cmcInvoice,
+			t.shippingMode,
+			t.destination,
+			t.cmc_comment,
+			t.readyDate,
+			t.modifyFlagString
 		FROM (
-			SELECT c.salesOrder AS salesOrder, b.po_no AS customerPO, b.part_no, b.qty,
-				   a.box_qty, b.rolls, b.pn,
-				   a.gross_weight AS grossWeight, a.net_weight AS netWeight,
-				   #{cmcInvoice} AS cmcInvoice, #{shippingMode} AS shippingMode, #{destination} AS destination,
-				   c.cmc_comment, CONVERT(varchar(10), #{readyDate}, 120) AS readyDate,
-				   CASE WHEN c.modifyFlag = 1 THEN '是' ELSE '否' END AS modifyFlagString,
-				   ROW_NUMBER() OVER (
-					   PARTITION BY a.site, a.bu_no, a.delNo, a.item_no
-					   ORDER BY b.notify_detail_item_no
-				   ) AS rn
-			FROM ecss_CoDelBoxList a
-			LEFT JOIN ecss_CoDelPalletDetail b ON a.site=b.site AND a.bu_no=b.bu_no AND a.delNo=b.delNo AND a.item_no=b.seq_no
-			LEFT JOIN ecss_CoDelNotifydetail c ON b.site=c.site AND b.bu_no=c.bu_no AND b.delNo=c.delNo AND b.notify_detail_item_no=c.item_no
-			WHERE a.site=#{site} AND a.bu_no=#{buNo} AND a.delNo=#{delNo} AND b.site IS NOT NULL
-		) t
+				 SELECT
+					 c.salesOrder AS salesOrder,
+					 b.po_no AS customerPO,
+					 b.part_no,
+					 b.qty,
+					 a.box_qty,
+					 b.rolls,
+					 b.pn,
+					 a.gross_weight AS grossWeight,
+					 a.net_weight AS netWeight,
+					 #{cmcInvoice} AS cmcInvoice,
+					 #{shippingMode} AS shippingMode,
+					 #{destination} AS destination,
+					 c.cmc_comment,
+					 CONVERT(varchar(10), #{readyDate}, 120) AS readyDate,
+					 CASE
+						 WHEN c.modifyFlag = 1 THEN
+							 '改单' +
+							 CASE
+								 WHEN h.modify_count IS NOT NULL THEN '(' + CAST(h.modify_count AS VARCHAR(10)) + ')'
+								 ELSE ''
+								 END
+						 ELSE '否'
+						 END AS modifyFlagString,
+
+					 ROW_NUMBER() OVER (
+            PARTITION BY a.site, a.bu_no, a.delNo, a.item_no
+            ORDER BY b.notify_detail_item_no
+        ) AS rn
+				 FROM ecss_CoDelBoxList a
+						  LEFT JOIN ecss_CoDelPalletDetail b
+									ON a.site = b.site
+										AND a.bu_no = b.bu_no
+										AND a.delNo = b.delNo
+										AND a.item_no = b.seq_no
+						  LEFT JOIN ecss_CoDelNotifydetail c
+									ON b.site = c.site
+										AND b.bu_no = c.bu_no
+										AND b.delNo = c.delNo
+										AND b.notify_detail_item_no = c.item_no
+						  LEFT JOIN ecss_CoDelNotifyHeader h
+									ON c.site = h.site and c.bu_no = h.bu_no
+										AND c.delNo = h.delNo
+				 WHERE a.site = #{site}
+				   AND a.bu_no = #{buNo}
+				   AND a.delNo = #{delNo}
+				   AND b.site IS NOT NULL
+			 ) t
 	</select>
 
 	<select id="searchEcssCoDelNotifyDetailList"   resultType="java.util.Map">