From d5933c7cb53fa536744aa9db9afe3f2102d62d57 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 30 Dec 2025 10:35:58 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-30=20=E6=94=B6=E8=B4=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/InboundNotificationDetailVo.java | 1 + .../inboundNotification/InboundNotificationDetailMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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