From 7baa0a2a9710055375c02bee6896e95dafad18e9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 23 Jan 2026 08:34:25 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-23=20=E6=94=B6=E8=B4=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E6=8B=A3=E8=B4=A7=E5=87=BA=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/OutboundNotificationDetailEntity.java         | 1 +
 .../InboundNotificationDetailMapper.xml                  | 9 ++++++++-
 .../OutboundNotificationDetailMapper.xml                 | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java b/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java
index 854604a..d17c944 100644
--- a/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java
+++ b/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java
@@ -27,4 +27,5 @@ public class OutboundNotificationDetailEntity extends QueryPage {
     private String orderref01;
     private String orderref02;
     private String orderref03;
+    private String remark;
 }
diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
index 494e936..2f6a55e 100644
--- a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
+++ b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
@@ -73,7 +73,8 @@
         a.related_order_no,
         a.related_order_line_no,
         a.actual_in_qty as actualStockInQty,
-        a.roll_no
+        a.roll_no,
+        a.remark
         FROM inbound_notification_detail as a
         left join WareHouse as b on a.site = b.site and a.bu_no = b.bu_no and a.in_warehouse = b.WareHouseID
         left join um as c on a.site = c.site and a.unit = c.UMID
@@ -155,6 +156,12 @@
             WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.inWarehouse}
         </foreach>
         ELSE in_warehouse
+        END,
+        remark = CASE
+        <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
+            WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.remark}
+        </foreach>
+        ELSE remark
         END
         WHERE site = #{list[0].site} AND bu_no = #{list[0].buNo} AND order_no = #{list[0].orderNo}
         AND (
diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
index baf0352..7b147cc 100644
--- a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
+++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
@@ -25,7 +25,8 @@
         a.related_order_no,
         a.related_order_line_no,
         a.actual_out_qty as actualStockOutQty,
-        a.orderref03
+        a.orderref03,
+        a.remark
         FROM outbound_notification_detail as a
         left join WareHouse as b on a.site = b.site and a.bu_no = b.bu_no and a.out_warehouse = b.WareHouseID
         left join um as c on a.site = c.site and a.unit = c.UMID
@@ -164,6 +165,12 @@
             WHEN part_no = #{item.partNo} THEN #{item.relatedOrderLineNo}
         </foreach>
         ELSE related_order_line_no
+        END,
+        remark = CASE
+        <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
+            WHEN part_no = #{item.partNo} THEN #{item.remark}
+        </foreach>
+        ELSE remark
         END
         WHERE part_no IN
         <foreach item="item" index="index" collection="list" open="(" separator="," close=")">