From 74ce420ffbd7b87293f7f56abbfa149c21a3f7bb Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 16 Oct 2025 15:08:13 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-16=20=E9=87=87=E8=B4=AD=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=94=9F=E6=88=90=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/wms/data/InboundQcResultData.java    | 1 +
 src/main/resources/mapper/wms/WmsPrintMapper.xml            | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java
index 9d5fe8c..9a9a30a 100644
--- a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java
+++ b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java
@@ -42,4 +42,5 @@ public class InboundQcResultData extends QueryPage {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
+    private String notifyNo;
 }
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 25d42e6..a6d3f02 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -7,6 +7,7 @@
         SELECT
         a.site,
         a.bu_no,
+        A.order_no AS notifyNo,
         d.inspection_no AS order_no,
         a.order_status,
         d.part_no,
@@ -36,7 +37,10 @@
                 and A.bu_no=#{query.buNo,jdbcType=CHAR}
             </if>
             <if test="query.orderNo != null and query.orderNo != ''">
-                and A.order_no like '%'+ #{query.orderNo,jdbcType=CHAR} +'%'
+                and d.inspection_no like '%'+ #{query.orderNo} +'%'
+            </if>
+            <if test="query.notifyNo != null and query.notifyNo != ''">
+                and a.order_no like '%'+ #{query.notifyNo} +'%'
             </if>
             <if test="query.partNo != null and query.partNo != ''">
                 and b.part_no like '%'+ #{query.partNo,jdbcType=CHAR} +'%'