From 61576df8e23dd85baa6b6b3671c216d7e7c4ec21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 23 Mar 2026 17:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handlingunit/entity/dto/HandlingUnitDto.java      |  7 ++++++-
 .../resources/mapper/warehouse/LabelQueryMapper.xml   | 11 ++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

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 @@
             <if test="params.inStockFlag != null and params.inStockFlag != ''">
                 AND h.in_stock_flag = #{params.inStockFlag}
             </if>
+            <!-- rqrq - 本期盘点 count_flag，仅 Y/N 入条件，空为全部 -->
+            <if test="params.countFlag != null and params.countFlag != ''">
+                AND h.count_flag = #{params.countFlag}
+            </if>
             <if test="params.partNo != null and params.partNo != ''">
                 AND h.part_no LIKE CONCAT('%', #{params.partNo}, '%')
             </if>
@@ -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 @@
             <if test="params.inStockFlag != null and params.inStockFlag != ''">
                 AND h.in_stock_flag = #{params.inStockFlag}
             </if>
+            <!-- rqrq - 本期盘点 count_flag，仅 Y/N 入条件，空为全部 -->
+            <if test="params.countFlag != null and params.countFlag != ''">
+                AND h.count_flag = #{params.countFlag}
+            </if>
             <if test="params.partNo != null and params.partNo != ''">
                 AND h.part_no LIKE '%' + #{params.partNo} + '%'
             </if>