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 @@
AND h.part_desc LIKE CONCAT('%', #{params.partDesc}, '%')
+
+ AND h.supplier_batch_no LIKE CONCAT('%', #{params.supplierBatchNo}, '%')
+
AND h.source_type = #{params.sourceType}