From 92167e0e41a8b63c4aa53dc8d75e83bbac70169b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 18 九月 2025 11:16:52 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 0b09bcf..e4c5085 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -96,11 +96,15 @@
     </select>
 
     <select id="selectPakInStep3" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and (wrk_sts = 3 or (wrk_sts = 12 and io_type = 11))
     </select>
 
     <select id="selectPickStep" resultMap="BaseResultMap">
         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="selectPickStep1" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
     </select>
 
     <select id="selectPakOutStep1" resultMap="BaseResultMap">
@@ -194,4 +198,13 @@
         and wrk_sts = 2 and io_type in (1,10,53,57)
         order by io_pri desc,io_time desc,wrk_no ASC
     </select>
+    <select id="selectWrkIoType" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where crn_no=#{crnNo} and wrk_sts=11 and io_type>100
+        order by io_pri desc,io_time ASC,wrk_no ASC
+    </select>
+
+    <select id="selectpj" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
+    </select>
 </mapper>

--
Gitblit v1.9.1