From ff9e3ab11bc19d90fa927524a37ecfbd69ca8505 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 24 Dec 2025 11:01:53 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-24=20=E9=94=80=E5=94=AE=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=A3=85=E7=AE=B1=E5=92=8C=E6=8B=A3=E8=B4=A7=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=AE=A2=E6=88=B7=E7=AE=80=E7=A7=B0?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/OutboundNotificationHeadVo.java                  | 1 +
 .../resources/mapper/boxManage/BoxForNotificationMapper.xml    | 3 ++-
 .../outboundNotification/OutboundNotificationHeadMapper.xml    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
index 4d3448e..f0ff74b 100644
--- a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
+++ b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
@@ -21,6 +21,7 @@ public class OutboundNotificationHeadVo extends OutboundNotificationHeadEntity {
     private Date endDate;
     private String userName;
     private String customerName;
+    private String customerAbb;                   // 客户简称
     private List<OutboundNotificationHeadVo> submitList;
     private String[] statusArr;
     
diff --git a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
index ddc5759..8b96083 100644
--- a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
+++ b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
@@ -338,6 +338,7 @@
             a.order_status as orderStatus,
             a.customer_id as customerId,
             c.customerName,
+            c.CustomerAbb as customerAbb,
 <!--            a.related_order_no as relatedOrderNo,-->
 <!--            a.related_order_line_no as relatedOrderLineNo,-->
             a.required_outbound_date as requiredOutboundDate,
@@ -433,7 +434,7 @@
             a.archived_by, a.archived_date, a.orderref1, a.orderref2, a.orderref3, a.orderref4, a.orderref5,
             a.order_date, a.close_flag, a.out_warehouse, a.customer_order_no, a.show_in_query_flag,
             b.part_no, b.part_desc, b.unit, b.required_qty, b.out_warehouse, b.out_batch_no, b.order_qty,
-            b.related_order_no, b.related_order_line_no, b.std_packing_qty, b.inspection_flag
+            b.related_order_no, b.related_order_line_no, b.std_packing_qty, b.inspection_flag, c.CustomerAbb
         ORDER BY a.created_date DESC, b.part_no
     </select>
 
diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml
index c94c25b..43db730 100644
--- a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml
+++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml
@@ -18,6 +18,7 @@
         NULLIF(LTRIM(RTRIM(s.SupplierName)), ''),
         ''
         ) AS customerName,
+        COALESCE(b.CustomerAbb, '') AS customerAbb,
         a.related_order_no,
         a.related_order_line_no,
         a.required_outbound_date,