2025-12-24

优化

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>
 
     <!--按照条件查询上机卷记录-->

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>