From 8785f4be8695d8ef8f3068f3cac7e6d98f4d89dd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 6 Feb 2026 17:02:02 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-06=20=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=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 ++++++
 .../mapper/warehouse/LabelTransactionLogMapper.xml          | 6 ++++++
 src/main/resources/mapper/wms/WmsPrintMapper.xml            | 3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/report/InboundNotificationReportMapper.xml b/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
index 442480e..3ceb36e 100644
--- a/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
+++ b/src/main/resources/mapper/report/InboundNotificationReportMapper.xml
@@ -96,6 +96,9 @@
             <if test="query.queryRelatedOrderLineNo != null and query.queryRelatedOrderLineNo != ''">
                 AND d.related_order_line_no LIKE '%' + #{query.queryRelatedOrderLineNo} + '%'
             </if>
+            <if test="query.rollNo != null and query.rollNo != ''">
+                AND d.roll_no LIKE '%' + #{query.rollNo} + '%'
+            </if>
         </where>
         ORDER BY h.created_date DESC, h.order_no, d.part_no
         OFFSET #{offset} ROWS FETCH NEXT #{limit} ROWS ONLY
@@ -149,6 +152,9 @@
             <if test="query.queryRelatedOrderLineNo != null and query.queryRelatedOrderLineNo != ''">
                 AND d.related_order_line_no LIKE '%' + #{query.queryRelatedOrderLineNo} + '%'
             </if>
+            <if test="query.rollNo != null and query.rollNo != ''">
+                AND d.roll_no LIKE '%' + #{query.rollNo} + '%'
+            </if>
         </where>
     </select>
 
diff --git a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml
index 66fedc1..7177206 100644
--- a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml
+++ b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml
@@ -75,6 +75,9 @@
         <if test="query.transactionId != null and query.transactionId != ''">
             AND a.transaction_id LIKE '%' + #{query.transactionId} + '%'
         </if>
+        <if test="query.batchNo != null and query.batchNo != ''">
+            AND a.batch_no LIKE '%' + #{query.batchNo} + '%'
+        </if>
         <if test="query.startDate != null and query.startDate != ''">
             AND a.transaction_date &gt;= #{query.startDate}
         </if>
@@ -134,6 +137,9 @@
         <if test="query.transactionId != null and query.transactionId != ''">
             AND a.transaction_id LIKE '%' + #{query.transactionId} + '%'
         </if>
+        <if test="query.batchNo != null and query.batchNo != ''">
+            AND a.batch_no LIKE '%' + #{query.batchNo} + '%'
+        </if>
         <if test="query.startDate != null and query.startDate != ''">
             AND a.transaction_date &gt;= #{query.startDate}
         </if>
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 0453cf5..01645c1 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -320,7 +320,8 @@
     <select id="getPartLabelTemplateList" resultType="java.util.HashMap">
         SELECT
             label_type_tb as labelNo,
-            label_type as labelName
+            label_type as labelName,
+            default_flag as defaultFlag
         FROM part_label_template
         WHERE site = #{site}
           AND bu_no = #{buNo}