From 9bcb7fe6ed1b97da7cd8b8f5af3e5c08a2bc7ff0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 19 九月 2025 08:50:07 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 555666b..0746e7a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,15 +63,16 @@
     </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,error_time,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,5,crn_end_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() 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>
 
@@ -109,6 +110,7 @@
         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