From da90de2db9655cc15c16b9e33e0b4334d9e1fb75 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 3 Dec 2025 10:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=88=E6=9D=BF=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/ecss/data/EcssCoDelPalletHeaderData.java  | 2 ++
 src/main/resources/mapper/ecss/CoDelMapper.xml            | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletHeaderData.java b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletHeaderData.java
index d4a693fe..8baaddae 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletHeaderData.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletHeaderData.java
@@ -22,4 +22,6 @@ public class EcssCoDelPalletHeaderData extends EcssCoDelPalletHeader {
     private String palletRecords; //托盘记录
 
     private BigDecimal boxQty; //箱数
+
+    private BigDecimal weight;
 }
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index f0ffb6c4..ac2332db 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -475,9 +475,11 @@ create_by,create_date,update_by,update_date
     </insert>
 
     <select id="searchEcssCoDelPalletHeaderData" resultType="EcssCoDelPalletHeaderData">
-        select site,bu_no,delNo,seq_no,pallet_no,pallet_qty,[length],width,height,volume,gross_weight,net_weight,pallet_remark,create_by,
-               create_date,update_by,update_date,pallet from ecss_CoDelPalletHeader
-        where site =#{site} and bu_no=#{buNo} and delNo=#{delNo}
+        select a.site,a.bu_no,a.delNo,a.seq_no,a.pallet_no,a.pallet_qty,a.length,a.width,a.height,a.volume,a.gross_weight,a.net_weight,a.pallet_remark,a.create_by,
+               a.create_date,a.update_by,a.update_date,a.pallet,CONVERT(DECIMAL(20, 3),(isnull(p.pallet_weight,0)*a.pallet_qty)) as weight
+        from ecss_CoDelPalletHeader a
+                 LEFT JOIN ecss_pallet p on a.pallet=p.pallet_no and a.site=p.Site and a.bu_no=p.BuNo
+        where a.site =#{site} and a.bu_no=#{buNo} and a.delNo=#{delNo}
     </select>
 
     <select id="searchEcssCoDelPalletDetailData" resultType="EcssCoDelPalletDetailData">