From 42cd8bd85471e202ccc903babdb673b0fe91e8e8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 29 Sep 2026 09:51:48 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-29=20=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
=?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/report/InboundNotificationReportMapper.xml | 6 ++++++
src/main/resources/mapper/wms/WmsPrintMapper.xml | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/main/resources/mapper/report/InboundNotificationReportMapper.xml b/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
index d223c0c..6f1397b 100644
--- a/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
+++ b/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
@@ -102,6 +102,9 @@
AND h.department_no = #{query.departmentNo}
+
+ AND h.in_warehouse = #{query.inWarehouse}
+
ORDER BY h.created_date DESC, h.order_no, d.part_no
@@ -160,6 +163,9 @@
AND h.department_no = #{query.departmentNo}
+
+ AND h.in_warehouse = #{query.inWarehouse}
+
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 71fd1ca..e0a1e24 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -259,6 +259,9 @@
and a.batch_no like '%'+ #{query.batchNo}+'%'
+
+ and a.wdr like '%'+ #{query.wdr}+'%'
+
order by a.first_in_date, a.site, a.bu_no, a.roll_no