From 76a7d8ed4bacb29ebc2abdc0fff2007b0fe732eb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期六, 18 十月 2025 18:28:31 +0800
Subject: [PATCH] 调试

---
 src/main/resources/mapper/WrkMastMapper.xml |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d078984..3772083 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -87,6 +87,14 @@
         select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
     </select>
 
+    <select id="selectPakInStep1All" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and crn_no=#{crnNo}  order by io_pri desc,io_time,wrk_no ASC
+    </select>
+
+    <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where  barcode = #{barcode}
+    </select>
+
     <select id="selectPakInStep11" resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
     </select>
@@ -94,6 +102,21 @@
     <select id="selectPakInStep2" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} 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="selectPakInStep103" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts=103 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="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 crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
+    </select>
+
+
 
     <select id="selectPakInStep3" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
@@ -103,12 +126,18 @@
         select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
     </select>
 
+    <select id="selectPickStep3" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and io_type=107
+    </select>
+
+
+
     <select id="selectPakOutStep1" resultMap="BaseResultMap">
         select top 1 * 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="selectPakOutStep2" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+        select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and (wrk_sts=12 or wrk_sts=108) and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
@@ -120,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) and crn_no=#{crnNo} order by io_time,wrk_no
     </select>
 
 <!--    &lt;!&ndash; 鍏ュ簱浠诲姟 &ndash;&gt;-->
@@ -160,6 +189,13 @@
         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="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>
+
+
+
+
     <!--                                       鍏ュ嚭搴撴ā寮忕浉鍏�                                      -->
     <select id="selectWorkingPakin" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
@@ -182,4 +218,11 @@
     <select id="selectPakoutEmpty" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where  io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
     </select>
+    <select id="selectPickStep2" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where barcode = #{barcode} and (wrk_sts=14 and io_type=107) or (wrk_sts=2 and io_type=57)
+    </select>
+    <select id="selectByWrkNo" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_no = #{wrkNo}
+    </select>
 </mapper>

--
Gitblit v1.9.1