From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13

---
 src/main/resources/mapper/WrkMastMapper.xml |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 9e75843..0746e7a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,15 +63,54 @@
     </resultMap>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 Or wrk_sts = 108 Or wrk_sts = 106 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
     </select>
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         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 crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+           or (wrk_sts=15 and io_type= 301)
+           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,5,crn_end_time) &lt;= getdate() or dateadd(mi,1,modi_time) &lt;= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp))
+           or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) &lt;= getdate() or dateadd(mi,1,modi_time) &lt;= getdate()) 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>
+
+    <select id="selectWrkMastWrkDetlMatnrBatch" resultMap="BaseResultMap">
+        select m.* from asr_wrk_mast m,asr_wrk_detl d
+        where 1=1
+        and m.wrk_no = d.wrk_no
+        and m.io_type = #{ioType}
+        and m.crn_no = #{crnNo}
+        and d.matnr = #{matnr}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and d.batch = #{batch}
+            </when>
+            <otherwise>
+                and (d.batch IS NULL OR d.batch = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="grade != null and grade != ''">
+                and d.brand = #{grade}
+            </when>
+            <otherwise>
+                and (d.brand IS NULL OR d.brand = '')
+            </otherwise>
+        </choose>
+    </select>
+    <select id="selectToShuttleTask" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_sts=2
+           and crn_no = 7
+        order by io_time,wrk_no asc
+    </select>
+    <select id="selectToShuttleOutTask" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_sts=11
+          and crn_no = 7
+          and io_type != 11
         order by io_time,wrk_no asc
     </select>
 

--
Gitblit v1.9.1