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 2d416e9..dee1bb8 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
@@ -99,7 +99,12 @@ public class HandlingUnitDto {
private Date endDate;
/**
- * 上次盘点日期 - rqrq
+ * 本期盘点标记 handling_unit.count_flag,Y/N;标签查询筛选时传 Y、N,空表示全部 - rqrq
+ */
+ private String countFlag;
+
+ /**
+ * 最后盘点日期 handling_unit.last_count_date - rqrq
*/
private Date lastCountDate;
}
diff --git a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
index e60921f..f984092 100644
--- a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
+++ b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
@@ -30,7 +30,7 @@
w.WareHouseName as warehouseName,
l.LocationName as locationName,
h.height,h.wdr,h.eng_chg_level as engChgLevel,h.expired_date as expiredDate,
- h.last_count_date as lastCountDate,h.source_type as sourceType
+ h.count_flag as countFlag,h.last_count_date as lastCountDate,h.source_type as sourceType
FROM handling_unit h WITH (NOLOCK)
LEFT JOIN warehouse w WITH (NOLOCK) ON h.warehouse_id = w.WareHouseID AND h.site = w.Site
LEFT JOIN location l WITH (NOLOCK) ON h.location_id = l.LocationID AND h.site = l.Site
@@ -41,6 +41,10 @@
AND h.in_stock_flag = #{params.inStockFlag}
+
+
+ AND h.count_flag = #{params.countFlag}
+
AND h.part_no LIKE CONCAT('%', #{params.partNo}, '%')
@@ -102,6 +106,7 @@
b.position,
b.layer,
p.calling_flag,
+ h.count_flag AS countFlag,
h.last_count_date AS lastCountDate,
h.eng_chg_level AS engChgLevel,
h.expired_date AS expiredDate,
@@ -121,6 +126,10 @@
AND h.in_stock_flag = #{params.inStockFlag}
+
+
+ AND h.count_flag = #{params.countFlag}
+
AND h.part_no LIKE '%' + #{params.partNo} + '%'