From f0429051895816ebadc50bbc409021e23e4d1a3a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 16:43:06 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 66aac22..78edc77 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -59,6 +59,7 @@
 <!--        <result column="Pdc_type" property="PdcType" />-->
         <result column="ctn_no" property="ctnNo" />
         <result column="full_plt" property="fullPlt" />
+        <result column="take_none" property="takeNone" />
 
     </resultMap>
 
@@ -78,7 +79,7 @@
         select * from asr_wrk_mast
         where wrk_sts=5
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>
@@ -112,6 +113,15 @@
 
     <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="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>
+    <select id="selectPakOutStep9997" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where wrk_no = 9997 and wrk_sts=12 and io_type = 12 order by io_pri desc,io_time desc,wrk_no ASC
+    </select>
+    <select id="selectPakOutStep107" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
@@ -201,4 +211,14 @@
         select * from asr_wrk_mast
         where wrk_no = #{wrkNo}
     </select>
+    <select id="selectByWrkNo9996" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_no = #{wrkNo}
+        and wrk_sts = 11
+    </select>
+    <select id="selectByWrkNo9997" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_no = #{wrkNo}
+        and wrk_sts = 11
+    </select>
 </mapper>

--
Gitblit v1.9.1