From 2bd22e9a59ba5a5ce6935adf9f9bbb02ed171776 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 十一月 2022 10:12:40 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index db50b46..d62b2c7 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -64,7 +64,7 @@
</resultMap>
- <select id="selectByLocNo" resultMap="BaseResultMap">
+ <select id="selectBySourceLocNo" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
</select>
@@ -90,7 +90,7 @@
</select>
<select id="selectPakInStep23456" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6) and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6,7,8) and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep45" resultMap="BaseResultMap">
@@ -98,7 +98,7 @@
</select>
<select id="selectCrnWaiting" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5,7,13)
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5,7,13, 16)
</select>
<select id="selectCarWaiting" resultMap="BaseResultMap">
@@ -106,11 +106,15 @@
</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="selectPickStepByBarcode" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=17 and (io_type=103 or io_type=107 or io_type=104)
</select>
<select id="selectPakOutStep111215" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts in (11,12,15) and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts in (11,12,13,14,15, 16) and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectPakOutStep16" resultMap="BaseResultMap">
@@ -118,7 +122,7 @@
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts in (3,6,11,12,15) and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
@@ -129,4 +133,30 @@
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="selectPakin" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast
+ where 1=1
+ and wrk_sts in (3,4,5,6,7,8,9)
+ and crn_no=#{crnNo}
+ <if test="steNo != null">
+ and ste_no = #{steNo}
+ </if>
+ </select>
+
+ <select id="selectPakout" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and
+ (
+ (wrk_sts in (12,13,14,15,16,17) and io_type in (101, 110))
+ or
+ (wrk_sts in (12,13,14,15,16) and io_type in (103, 104, 107))
+ )
+ and crn_no=#{crnNo}
+ <if test="steNo != null">
+ and ste_no = #{steNo}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.1