From 6e96e802901984581875ed6a16957cefc7007e5e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 25 十一月 2025 18:39:52 +0800
Subject: [PATCH] *

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 78edc77..8bcc878 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -64,11 +64,19 @@
     </resultMap>
 
     <select id="selectByLocNo"  resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and  (ctn_no is null or ctn_no != 'Y')
+        select top 1 * from asr_wrk_mast where 1=1 and source_loc_no = #{sourceLocNo} and  (ctn_no is null or ctn_no != 'Y')
+    </select>
+
+    <select id="selectByBarcodeTwo"  resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where 1=1 and barcode = #{barcode} and  wrk_sts = 2
     </select>
 
     <select id="selectByLocNo1"  resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
+    </select>
+
+    <select id="selectByCrnNo"  resultMap="BaseResultMap">
+        select * from asr_wrk_mast where 1=1 and crn_no = #{crnNo}
     </select>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -103,6 +111,14 @@
         select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
     </select>
 
+    <select id="selectPakInStep5" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo}
+    </select>
+
+    <select id="selectPakInStep12" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast where wrk_sts=2 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="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>
@@ -114,6 +130,11 @@
     <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>
+
+    <select id="selectPakOutStep12" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+    </select>
+
     <select id="selectPakOutStep9996" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where wrk_no = 9996 and wrk_sts=12 and io_type = 12 order by io_pri desc,io_time desc,wrk_no ASC
     </select>

--
Gitblit v1.9.1