From c0fc45a7cd97c2ded531b85575e6f26ff269db1b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 24 二月 2026 15:22:25 +0800
Subject: [PATCH] 第一次进场调试

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 480fc7d..290fc0b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -67,7 +67,7 @@
     </select>
 
     <select id="selectByLocNo1"  resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo})
+        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
     </select>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -86,6 +86,9 @@
     <select id="selectPakInStep1" resultMap="BaseResultMap">
         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="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
@@ -102,6 +105,12 @@
     <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="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
@@ -160,6 +169,10 @@
         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="selectPakOutStep11To2" resultMap="BaseResultMap">
+        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="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
@@ -179,4 +192,14 @@
         and source_sta_no = #{sourceStaNo}
         order by io_time,wrk_no
     </select>
+    <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