From 5e99ddd00c1155966bb8d1f67729ab85e72fcf39 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 25 Dec 2025 17:31:43 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-24=20=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/schedule/ScheduleMapper.xml | 2 +-
 src/main/resources/mapper/wms/WmsPrintMapper.xml      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 17f816b..ef839df 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -867,7 +867,7 @@
                 AND smh.HistSeqNo = #{histSeqNo}
             </if>
         </where>
-        ORDER BY (CASE WHEN smh.FinishFlag = 'Y' THEN 1 ELSE  999 END ) ASC, smh.HistSeqNo DESC
+        ORDER BY (CASE WHEN smh.FinishFlag = 'N' THEN 1 ELSE  999 END ) ASC, smh.HistSeqNo DESC
     </select>
 
     <!--按照条件查询上机卷记录-->
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index acffd8c..34d7547 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -57,6 +57,9 @@
             <if test="query.orderStatus != null and query.orderStatus != ''">
                 and a.order_status = #{query.orderStatus,jdbcType=VARCHAR}
             </if>
+            <if test="query.orderStatus == null or query.orderStatus == ''">
+                and a.order_status != '待检验'
+            </if>
             <if test="query.supplierName != null and query.supplierName != ''">
                 and c.SupplierName like '%'+ #{query.supplierName} +'%'
             </if>