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 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.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 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,