diff --git a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java index 53b46d6..ad1846f 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java @@ -23,4 +23,5 @@ public class InboundNotificationDetailVo extends InboundNotificationDetailEntity private String status; private Double countRollNo; private String umName; + private String inboundWarehouseId; } \ No newline at end of file diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml index a0c0a48..96ccc09 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml @@ -188,7 +188,8 @@ a.LotSize as order_qty, pr.RollNo as rollNo, pr.RollQty as requiredQty, - pr.remark + pr.remark, + c.inbound_warehouse_id as inboundWarehouseId FROM ShopOrder a INNER JOIN SFDC_Rolls pr ON a.site = pr.site AND a.bu_no = pr.bu_no AND a.OrderNo = pr.OrderNo LEFT JOIN inbound_notification_detail b ON pr.Site = b.site AND pr.bu_no = b.bu_no AND pr.OrderNo = b.related_order_no AND pr.RollNo = b.roll_no