From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d16d4c2..b488c53 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,9 @@
     <select id="selectByLocNo1"  resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no=#{sourceLocNo}
     </select>
-
+    <select id="selectByOnlyWrkNo"  resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where wrk_no = #{wrkNo}
+    </select>
     <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>
@@ -223,16 +225,21 @@
 
     <select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer">
         select count (*) from dbo.asr_wrk_mast where 1=1
+        and wrk_no!=#{workNo}
         and
         (
         <choose>
             <when test="sour &lt; 200">
                 (wrk_sts > 11 and wrk_sts &lt; 18 and source_sta_no &lt; 200 and io_type > 101 and io_type &lt; 110)
                 or
+                (wrk_sts = 11 and source_sta_no &lt; 200 and io_type > 101 and io_type &lt; 110 and ste_no is not null)
+                or
                 (wrk_sts &lt; 3 and sta_no &lt; 200 and io_type &lt; 100 and io_type > 9 and io_type != 11 )
             </when>
             <otherwise>
                 (wrk_sts > 11 and wrk_sts &lt; 18 and source_sta_no > 200 and io_type > 101 and io_type &lt; 110)
+                or
+                (wrk_sts = 11 and source_sta_no > 200 and io_type > 101 and io_type &lt; 110 and ste_no is not null)
                 or
                 (wrk_sts &lt; 3 and sta_no > 200 and io_type &lt; 100 and io_type > 9 and io_type != 11)
             </otherwise>
@@ -266,11 +273,20 @@
         order by io_time,wrk_no
     </select>
 
+    <select id="selectWorkingPakoutTwoF" resultMap="BaseResultMap">
+        select top 1 *
+        from dbo.asr_wrk_mast
+        where wrk_sts > 10
+        and io_type > 100 and io_type != 11
+        and sta_no = #{staNo}
+        order by io_time,wrk_no
+    </select>
+
     <select id="selectShallowLoc" resultMap="BaseResultMap">
         select top 1 *
         from dbo.asr_loc_mast
         where 1=1
-        and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X' and loc_sts != 'O'
+        and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X' and loc_sts != 'O' and loc_sts != 'R' and loc_sts != 'P'
         and bay1 = #{bay}
         and lev1 = #{lev}
         <if test="row &lt;= 3">

--
Gitblit v1.9.1