From 44caaab87e53c645e63ec27829223b429e8e63df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 九月 2022 10:09:48 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d83e93c..db50b46 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -13,6 +13,7 @@
<result column="io_type" property="ioType" />
<result column="crn_no" property="crnNo" />
<result column="ste_no" property="steNo" />
+ <result column="out_most" property="outMost" />
<result column="sheet_no" property="sheetNo" />
<result column="io_pri" property="ioPri" />
<result column="wrk_date" property="wrkDate" />
@@ -96,24 +97,24 @@
select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5)
</select>
- <select id="selectPakInStep7" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts = 7
+ <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>
- <select id="selectPakInStep8" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where ste_no=#{steNo} and wrk_sts = 8
+ <select id="selectCarWaiting" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (2,8,11,14)
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
+ 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="selectPakOutStep1" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ <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>
- <select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ <select id="selectPakOutStep16" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=16 and io_type > 100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
@@ -125,7 +126,7 @@
</select>
<select id="selectWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=7 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
+ 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>
</mapper>
--
Gitblit v1.9.1