From 131fd52a71e4801957a80305afb2ea959ecc72fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 10:09:52 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 1937f10..761b714 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>
 
@@ -147,7 +147,7 @@
     <select id="selectBy2125" resultMap="BaseResultMap">
         select * from dbo.asr_wrk_mast
         where wrk_sts in (21,25)
-        and io_type in (101,103,110)
+        and io_type in (101,103,107,110)
         order by io_pri desc,wrk_sts desc
     </select>
 
@@ -174,7 +174,7 @@
     <select id="selectInOutWrkMast" resultMap="BaseResultMap">
         select * from asr_wrk_mast
         where io_type in (1,101)
-        and wrk_sts not in (14,15,34,35)
+        and wrk_sts not in (9,10,29,30)
         order by io_pri desc,wrk_sts desc
     </select>
 
@@ -187,7 +187,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
@@ -225,4 +225,13 @@
         and barcode = #{barcode}
         order by io_pri desc,io_time,wrk_no asc
     </select>
+
+    <select id="selectInWrkMastByLiftNo" resultMap="BaseResultMap">
+        select * from dbo.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