From 186f3aa1588ba8c1e26e9aa953ad237862427477 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 28 Oct 2025 10:30:24 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-28=20=E4=BB=93=E5=BA=93=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9pda=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/warehouse/CountingWIPMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/CountingWIPMapper.xml b/src/main/resources/mapper/warehouse/CountingWIPMapper.xml
index faa5dd8..46e5352 100644
--- a/src/main/resources/mapper/warehouse/CountingWIPMapper.xml
+++ b/src/main/resources/mapper/warehouse/CountingWIPMapper.xml
@@ -19,7 +19,7 @@
         <result property="labelType" column="label_type"/>
     </resultMap>
 
-    <!-- 查询当天的盘点单列表 -->
+    <!-- 查询盘点单列表（默认查询未完成的盘点单） -->
     <select id="queryTodayCountingList" resultType="map">
         SELECT
             cr.site,
@@ -46,11 +46,11 @@
         FROM counting_report cr
         WHERE cr.site IN (SELECT site FROM AccessSite WHERE UPPER(userID) = #{userName})
           AND cr.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{userName})
-          AND CONVERT(varchar(10), cr.plan_date, 120) = CONVERT(varchar(10), GETDATE(), 120)
+          AND cr.status IN (0, 1, 2)  -- 只查询未完成的盘点单（草稿、盘点中、待核销）
         <if test="reportId != null and reportId != ''">
             AND cr.report_id LIKE '%' + #{reportId} + '%'
         </if>
-        ORDER BY cr.create_date DESC
+        ORDER BY cr.plan_date DESC, cr.create_date DESC
     </select>
 
     <!-- 根据盘点单号查询WIP数据 -->