From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index c18141f..ab88e90 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -117,6 +117,15 @@
order by io_pri desc,wrk_sts desc
</select>
+ <select id="selectInStep4" resultMap="BaseResultMap">
+ select *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and wrk_sts = 4
+ and io_type in (1,10,53)
+ order by io_pri desc,wrk_sts desc
+ </select>
+
<select id="selectByWorkNo" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
where wrk_no=#{workNo}
@@ -132,7 +141,7 @@
<select id="selectByWorkNo324104" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
where wrk_no=#{workNo}
- and wrk_sts in (3,24,104)
+ and wrk_sts in (3,24,103,106)
</select>
<select id="selectBy2125" resultMap="BaseResultMap">
@@ -159,26 +168,27 @@
<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="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>
<select id="selectLocToLocWrkMast" resultMap="BaseResultMap">
select * from asr_wrk_mast
where io_type in (11)
- 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>
<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>
@@ -187,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>
@@ -194,7 +205,7 @@
<select id="selectShuttleMoveWrk" resultMap="BaseResultMap">
select * from dbo.asr_wrk_mast
where 1=1
- and wrk_sts in (101,103,105,107)
+ 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>
@@ -203,8 +214,15 @@
select top 1 * from dbo.asr_wrk_mast
where 1=1
and shuttle_no = #{shuttleNo}
- and wrk_sts not in (9,10,29,30)
+ 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 dbo.asr_wrk_mast
+ where 1=1
+ and barcode = #{barcode}
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1