From fcc38f90f19b5dd09bac80cfa3069817c6243acb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 11 十二月 2025 09:37:50 +0800
Subject: [PATCH] #1

---
 src/main/resources/mapper/WrkMastMapper.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f9d225e..2bfb733 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -108,10 +108,12 @@
     </select>
 
 
-
+    <select id="selectPakInStep104" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts=104 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+    </select>
 
     <select id="selectByPltType" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=103 and crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
+        select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
     </select>
 
 
@@ -147,7 +149,7 @@
     </select>
 
     <select id="selectWorking" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
+        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12 or wrk_sts=103 or wrk_sts=105 or wrk_sts=106 or wrk_sts=108) and crn_no=#{crnNo} order by io_time,wrk_no
     </select>
 
 <!--    &lt;!&ndash; 鍏ュ簱浠诲姟 &ndash;&gt;-->
@@ -187,8 +189,8 @@
         select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
     </select>
 
-    <select id="selectPakOutStep105" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=105 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+    <select id="selectPakOutStep107" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time,wrk_no asc
     </select>
 
 

--
Gitblit v1.9.1