From cec95e176a9cfaa7661883f66dcebcc98a8b6449 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 十月 2025 10:14:32 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index bdab988..989de93 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -100,7 +100,7 @@
     </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 top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=16 and (io_type=103 or io_type=107 or io_type=104)
     </select>
 
     <select id="selectPakOutStep1" resultMap="BaseResultMap">
@@ -112,7 +112,7 @@
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc, io_time,wrk_no
     </select>
 
     <select id="selectLocMoving" resultMap="BaseResultMap">
@@ -187,4 +187,10 @@
     <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where  barcode = #{barcode}
     </select>
+    <select id="selectPakOutStep14" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast
+        where crn_no=#{crnNo}
+          and ((wrk_sts=14 and io_type in (103,107) and source_sta_no=#{sourceStaNo}) or (wrk_sts in (2,3) and io_type in (53,57) and sta_no=#{sourceStaNo}))
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
 </mapper>

--
Gitblit v1.9.1