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}
- 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
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 @@
and a.order_status = #{query.orderStatus,jdbcType=VARCHAR}
+
+ and a.order_status != '待检验'
+
and c.SupplierName like '%'+ #{query.supplierName} +'%'