From 225419ebffd1c9de5f6da8213325560f151d87fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 21 Oct 2025 16:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=89=AB=E6=8F=8F=20=20?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/modules/pad/vo/DelNotifyDetailVo.java     |  4 ++++
 .../resources/mapper/pad/DelNotifyDetailMapper.xml     | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java b/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java
index 7ffa20d..eef5972 100644
--- a/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java
+++ b/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java
@@ -22,4 +22,8 @@ public class DelNotifyDetailVo extends DelNotifyDetail {
     private String contractNo;
 
     private BigDecimal allNum;
+    private BigDecimal mdsl;
+    private BigDecimal zxds;
+    private BigDecimal zxsl;
+    private String zxgg;
 }
diff --git a/src/main/resources/mapper/pad/DelNotifyDetailMapper.xml b/src/main/resources/mapper/pad/DelNotifyDetailMapper.xml
index dae0573..062b1ce 100644
--- a/src/main/resources/mapper/pad/DelNotifyDetailMapper.xml
+++ b/src/main/resources/mapper/pad/DelNotifyDetailMapper.xml
@@ -30,6 +30,10 @@
         <result column="SubOrderType" property="subOrderType"/>
         <result column="ContractNo" property="contractNo"/>
         <result column="allNum" property="allNum"/>
+        <result column="mdsl" property="mdsl"/>
+        <result column="zxds" property="zxds"/>
+        <result column="zxsl" property="zxsl"/>
+        <result column="zxgg" property="zxgg"/>
     </resultMap>
 
     <select id="selectByDelNotifyNo" resultMap="getDelNotifyDetail">
@@ -59,7 +63,11 @@
             D.Ins_ApprovedBy,
             D.Ins_ApprovedDate,
             D.Ins_Remark,
-            (select sum(o.scan_qty) from outbound_label_scan o where o.Site = D.Site and o.del_notify_no = D.DelNotifyNo and o.del_notify_item_no = D.DelNotifyItemNo) as allNum
+            (select sum(o.scan_qty) from outbound_label_scan o where o.Site = D.Site and o.del_notify_no = D.DelNotifyNo and o.del_notify_item_no = D.DelNotifyItemNo) as allNum,
+            dbo.Get_Object_Properties_Value_Number(D.Site,'P',D.PartNo,1,'QTY/BAG') as mdsl,
+            dbo.Get_Object_Properties_Value_Number(D.Site,'P',D.PartNo,1,'BAG') as zxds,
+            dbo.Get_Object_Properties_Value_Number(D.Site,'P',D.PartNo,1,'QTY') as zxsl,
+            dbo.Get_Object_Properties_Value_Text(D.Site,'P',D.PartNo,1,'CARTON') as zxgg
         from
             dbo.CODelNotifyDetail as D,
             dbo.COHeader as Y,