From 2be558af5cfe16633d076ed9ca3822acb17553ac Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 5 Jun 2026 15:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/handlingunit/entity/dto/HandlingUnitDto.java      | 3 ++-
 src/main/resources/mapper/warehouse/LabelQueryMapper.xml      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java b/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java
index dee1bb8..76bf4ca 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java
@@ -32,6 +32,7 @@ public class HandlingUnitDto {
     private String orderRef2;
     private String orderRef3;
     private String supplierId;
+    private String supplierBatchNo;
     private String customerId;
     private Date manufactureDate;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -97,7 +98,7 @@ public class HandlingUnitDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
-    
+
     /**
      * 本期盘点标记 handling_unit.count_flag，Y/N；标签查询筛选时传 Y、N，空表示全部 - rqrq
      */
diff --git a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
index a64af64..7e86723 100644
--- a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
+++ b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
@@ -29,6 +29,7 @@
             h.remark,
             w.WareHouseName as warehouseName,
             l.LocationName as locationName,
+            h.supplier_batch_no as supplierBatchNo,
         h.height,h.wdr,h.eng_chg_level as engChgLevel,h.expired_date as expiredDate,
         h.count_flag as countFlag,h.last_count_date as lastCountDate,h.source_type as sourceType
         FROM handling_unit h WITH (NOLOCK)
@@ -60,6 +61,9 @@
             <if test="params.partDesc != null and params.partDesc != ''">
                 AND h.part_desc LIKE CONCAT('%', #{params.partDesc}, '%')
             </if>
+            <if test="params.supplierBatchNo != null and params.supplierBatchNo != ''">
+                AND h.supplier_batch_no LIKE CONCAT('%', #{params.supplierBatchNo}, '%')
+            </if>
             <if test="params.sourceType != null and params.sourceType != ''">
                 AND h.source_type = #{params.sourceType}
             </if>