From 2f7f19db3b2a85bf0fd074416aa69de350a28614 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 08 三月 2023 07:55:38 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index db50b46..e395995 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -58,13 +58,13 @@
<result column="log_err_time" property="logErrTime" />
<result column="log_err_memo" property="logErrMemo" />
<result column="barcode" property="barcode" />
- <result column="Pdc_type" property="PdcType" />
+ <result column="Pdc_type" property="pdcType" />
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
</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,11 @@
</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="selectCrnWaiting2" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts = 18
</select>
<select id="selectCarWaiting" resultMap="BaseResultMap">
@@ -106,11 +110,25 @@
</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="selectWorkingOfPakOutBySource" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast
+ where 1=1
+ and source_loc_no in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ 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 +136,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 +147,85 @@
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>
+
+ <select id="selectWorkingByCrn" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and
+ (
+ (wrk_sts = 2 and crn_no != 2)
+ or
+ (wrk_sts in (3,4,5,6,7))
+ or
+ (wrk_sts in (11,12,13,14,15,16))
+ )
+ <if test="crnNo != null">
+ and crn_no = #{crnNo}
+ </if>
+ </select>
+ <select id="selectAll" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1
+ and wrk_sts!=1 and wrk_sts!=11
+ and wrk_sts!=18 and wrk_sts!=9 and wrk_sts < 20 and io_type!=11
+ and source_sta_no=#{staNo}
+ </select>
+
+ <select id="selectPakinWorkingByGroupLoc" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and
+ (
+ (wrk_sts = 2 and ste_no != null)
+ or
+ (wrk_sts in (3,4,5,6,7,8))
+ )
+ and loc_no in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
+
+ <select id="selectPakoutWorkingByGroupLoc" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and
+ (
+ (wrk_sts = 11 and ste_no != null)
+ or
+ (wrk_sts in (12,13,14,15,16,17))
+ )
+ and source_loc_no in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
+
</mapper>
--
Gitblit v1.9.1