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} ELSE in_warehouse + END, + remark = CASE + + WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.remark} + + 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} ELSE related_order_line_no + END, + remark = CASE + + WHEN part_no = #{item.partNo} THEN #{item.remark} + + ELSE remark END WHERE part_no IN