From 8e5594bcd3ecffcdb4befd4e399f6bf18d0fdba9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 09:45:29 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a9e1f65..5106f54 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -66,10 +66,6 @@
 
     </resultMap>
 
-    <select id="selectBySourceLocNo"  resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
-    </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>
@@ -84,83 +80,131 @@
     </select>
 
     <select id="selectPakInStep1" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+        select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC limit 0,1
     </select>
 
     <select id="selectPakInStep11" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+        select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC limit 0,1
     </select>
 
-    <select id="selectPickStep" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and (io_type=103 or io_type=107 or io_type=104)
-    </select>
-
-    <select id="selectWorking" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=7 or wrk_sts=16) and crn_no=#{crnNo} order by io_time,wrk_no
-    </select>
-
-    <select id="selectAll" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast where 1=1
-        and wrk_sts!=1 and wrk_sts!=11
-        and wrk_sts!=18 and wrk_sts!=9 and wrk_sts &lt; 20 and io_type!=11
-        and source_sta_no=#{staNo}
-    </select>
-    
-    <select id="selectRackInStep48" resultMap="BaseResultMap">
-        select top 1 *
-        from dbo.asr_wrk_mast
+    <select id="selectInStep4" resultMap="BaseResultMap">
+        select *
+        from asr_wrk_mast
         where 1=1
-        and ((wrk_sts = 4) or (wrk_sts = 8 and shuttle_no is not null))
-        and sta_no = #{staNo}
-        and wrk_no=#{workNo}
-        and io_type in (1)
+        and wrk_sts = 4
+        and io_type in (1,10,53,57)
         order by io_pri desc,wrk_sts desc
     </select>
 
     <select id="selectByWorkNo" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast
+        select * from dbo.asr_wrk_mast
         where wrk_no=#{workNo}
+        limit 0,1
     </select>
 
-    <select id="selectLiftStep262327" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+    <select id="selectLiftStep223103" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
         where 1=1
-        and (wrk_sts in (6,23,27)
-            and shuttle_no is not null)
-        or (wrk_sts in (2)
-            and shuttle_no is null)
+        and wrk_sts in (2,23,103)
         order by io_pri desc,wrk_sts desc
     </select>
 
-    <select id="selectByWorkNo372428" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast
+    <select id="selectByWorkNo324104" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
         where wrk_no=#{workNo}
-        and wrk_sts in (3,7,24,28)
+        and wrk_sts in (3,24,103,106)
+        limit 0,1
     </select>
 
     <select id="selectBy2125" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+        select * from asr_wrk_mast
         where wrk_sts in (21,25)
-        and io_type in (101)
+        and io_type in (101,103,107,110)
         order by io_pri desc,wrk_sts desc
     </select>
 
     <select id="selectNoShuttleWrkByLev" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+        select * from asr_wrk_mast
         where shuttle_no is null
         and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 21 and source_loc_no like #{lev}))
         order by io_pri desc,wrk_sts desc
     </select>
 
     <select id="selectShuttleWrkByLev" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+        select * from asr_wrk_mast
         where shuttle_no is not null
-        and ((wrk_sts not in (14,15)  and loc_no like #{lev}) or (wrk_sts not in (34,35) and source_loc_no like #{lev}))
+        and ((wrk_sts not in (9,10)  and loc_no like #{lev}) or (wrk_sts not in (29,30) and source_loc_no like #{lev}))
+        order by io_pri desc,wrk_sts desc
+    </select>
+
+    <select id="selectShuttleOutWrkByLev" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where shuttle_no is not null
+        and (wrk_sts not in (29,30) and source_loc_no like #{lev})
         order by io_pri desc,wrk_sts desc
     </select>
 
     <select id="selectLiftWrkMast" resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast
         where lift_no = #{liftNo}
+        and wrk_sts in (3,4,24,25,102,103,104,105,106,107,108,109)
     </select>
+
+    <select id="selectLocToLocWrkMast" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where io_type in (11)
+        and wrk_sts not in (9,10,29,30)
+        order by io_pri desc,wrk_sts desc
+    </select>
+
+    <select id="selectPickStepByBarcode" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast
+        where io_type in (53,103,107)
+        and wrk_sts in (2,3,34,29)
+        and barcode = #{barcode}
+        order by io_pri desc,wrk_sts desc
+    </select>
+
+    <select id="selectShuttleHasMoveWorking" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast
+        where 1=1
+        and shuttle_no = #{shuttleNo}
+        and wrk_sts not in (111)
+        and io_type = 200
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
+
+    <select id="selectShuttleMoveWrk" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where 1=1
+        and wrk_sts in (101,103,105,107,109,111)
+        and io_type = 200
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
+
+    <select id="selectShuttleWorking" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast
+        where 1=1
+        and shuttle_no = #{shuttleNo}
+        and wrk_sts not in (9,10,23,29,30)
+        and io_type not in (200)
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
+
+    <select id="selectByBarcode" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast
+        where 1=1
+        and barcode = #{barcode}
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
+
+    <select id="selectInWrkMastByLiftNo" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where 1=1
+        and lift_no = #{liftNo}
+        and io_type &lt;= 100
+        and wrk_sts in (1,2,3,4,5)
+        order by io_pri desc,io_time,wrk_no asc
+    </select>
+
 </mapper>

--
Gitblit v1.9.1