From 32f3f3e2e358e87d4c4e7edb142943f107a0cccf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 15:02:51 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 96e18ac..626a234 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -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>
@@ -188,7 +188,7 @@
<select id="selectPickStepByBarcode" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast
where io_type in (53,103)
- and wrk_sts in (2,3,34)
+ and wrk_sts in (2,3,34,29)
and barcode = #{barcode}
order by io_pri desc,wrk_sts desc
</select>
@@ -197,6 +197,7 @@
select top 1 * from dbo.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>
@@ -217,4 +218,20 @@
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 dbo.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 dbo.asr_wrk_mast
+ where 1=1
+ and lift_no = #{liftNo}
+ and io_type <= 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