From 7d42dc149401791c84c70abec853edf7e900e034 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 24 十二月 2025 08:39:30 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastMapper.xml |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ac9d877..9a7ddfe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,13 +72,28 @@
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from asr_wrk_mast
-        where wrk_sts=5
-        or wrk_sts=44
-        or wrk_sts=64
-        or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
-        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))
+        where 1=1
+        and (
+                (
+                    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))
+                )
+                and log_mk = 'Y'
+            ) or (
+            wrk_sts=44
+            or wrk_sts=64
+            or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
+            )
+        order by io_time,wrk_no asc
+    </select>
+
+    <select id="selectToBeHistoryDataV1" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where 1=1
+        and (wrk_sts=5 or wrk_sts=15 or io_type = 107 or (wrk_sts!=5 and (io_type = 53 or io_type = 57)))
+        and log_mk != 'Y'
         order by io_time,wrk_no asc
     </select>
 
@@ -89,4 +104,27 @@
         order by io_time,wrk_no asc
     </select>
 
+    <update id="orderAddPri">
+        UPDATE asr_wrk_mast
+        SET io_pri = io_pri + 100000
+        WHERE 1=1
+          AND wrk_no IN (
+            SELECT wrk_no
+            FROM asr_wrk_detl
+            WHERE order_no = #{orderNo}
+        );
+    </update>
+
+    <update id="orderReducePri">
+        UPDATE asr_wrk_mast
+        SET io_pri = io_pri - 100000
+        WHERE 1=1
+          AND io_pri >= 100001
+          AND wrk_no IN (
+            SELECT wrk_no
+            FROM asr_wrk_detl
+            WHERE order_no = #{orderNo}
+        );
+    </update>
+
 </mapper>

--
Gitblit v1.9.1