From 9b7dc8a0a975547feb49c7f7b1e16929ecb7fd7f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 12 Jan 2026 15:43:22 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-12=20=E8=B0=83=E6=95=B4=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E7=AD=BE=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/schedule/data/SearchScheduleData.java | 9 +++++++++
 src/main/resources/mapper/schedule/ScheduleMapper.xml    | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
index e74b7f5..7c47c60 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -170,6 +170,15 @@ public class SearchScheduleData extends BaseData {
     private String resortDirection; // 调整方向 S向上 D向下
     private Integer rowCount;
     private String carrierNo;
+    private String batchNo;
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
 
     public Integer getRowCount() {
         return rowCount;
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index f3f3cc1..2a9be95 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -2021,15 +2021,15 @@
 
     <!-- 查询工单的订单备注信息 -->
     <select id="getOrderNotesByOrderNo" parameterType="SearchScheduleData" resultType="java.util.Map">
-        SELECT TOP 1 
+        SELECT TOP 1
             B.orderref01 AS orderNotes -- 订单备注信息
         FROM ShopOrder A
-        LEFT JOIN outbound_notification_detail B 
+        LEFT JOIN outbound_notification_detail B
             ON A.Site = B.site
             AND A.bu_no = B.bu_no
             AND A.batch_no = B.related_order_no
         WHERE A.Site = #{site}
-          AND A.OrderNo = #{orderNo}
+          AND A.OrderNo like '%' + #{batchNo} +'%'
     </select>
 
 </mapper>
\ No newline at end of file