From 4b8bdefa889a3e6797d2760bc207c0e373e86c86 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 07 二月 2024 09:17:22 +0800
Subject: [PATCH] #AGV 输送线扫码器扫描

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 626a234..4526992 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -122,7 +122,7 @@
         from dbo.asr_wrk_mast
         where 1=1
         and wrk_sts = 4
-        and io_type in (1,10,53)
+        and io_type in (1,10,53,57)
         order by io_pri desc,wrk_sts desc
     </select>
 
@@ -161,7 +161,14 @@
     <select id="selectShuttleWrkByLev" resultMap="BaseResultMap">
         select * from dbo.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 dbo.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>
 
@@ -187,7 +194,7 @@
 
     <select id="selectPickStepByBarcode" resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast
-        where io_type in (53,103)
+        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
@@ -234,4 +241,11 @@
         and wrk_sts in (1,2,3,4,5)
         order by io_pri desc,io_time,wrk_no asc
     </select>
+
+    <select id="select300Wrk" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where (source_sta_no in (300) and io_type > 100)
+        or (source_sta_no in (341) and wrk_sts = 2)
+        or (sta_no in (300) and shuttle_no is not null)
+    </select>
 </mapper>

--
Gitblit v1.9.1