From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 79abf49..c77eaff 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -67,7 +67,11 @@
     </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 source_loc_no = #{sourceLocNo} and  (ctn_no is null or ctn_no != 'Y') and  wrk_sts &lt; 14
+    </select>
+
+    <select id="selectByBarcodeTwo"  resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where barcode = #{barcode} and  wrk_sts = 2
     </select>
 
     <select id="selectByLocNo1"  resultMap="BaseResultMap">
@@ -88,7 +92,7 @@
     </select>
 
     <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 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) and (wrk_no not in (select wrk_no from asr_bas_devp)) order by io_pri desc,io_time,wrk_no ASC
     </select>
 
     <select id="selectPakInStep111" resultMap="BaseResultMap">

--
Gitblit v1.9.1