From 92167e0e41a8b63c4aa53dc8d75e83bbac70169b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 18 九月 2025 11:16:52 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 926df6c..e4c5085 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,7 +56,7 @@
<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" />
@@ -77,9 +77,9 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_sts=5
- or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
@@ -96,11 +96,15 @@
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and (wrk_sts = 3 or (wrk_sts = 12 and io_type = 11))
</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>
+
+ <select id="selectPickStep1" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
@@ -123,26 +127,26 @@
select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
-<!-- <!– 鍏ュ簱浠诲姟 –>-->
-<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
-<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
-<!-- </select>-->
+ <!-- <!– 鍏ュ簱浠诲姟 –>-->
+ <!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
+ <!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+ <!-- </select>-->
-<!-- <!– 鍑哄簱浠诲姟 –>-->
-<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
-<!-- select top 1 *-->
-<!-- from dbo.asr_wrk_mast-->
-<!-- where (wrk_sts in (11,12)-->
-<!-- or (wrk_sts in (14,15) and wrk_no in-->
-<!-- (-->
-<!-- select wrk_no-->
-<!-- from asr_bas_devp-->
-<!-- where wrk_no > 0)-->
-<!-- ))-->
-<!-- and io_type != 11-->
-<!-- and source_sta_no = 180-->
-<!-- order by io_time,wrk_no-->
-<!-- </select>-->
+ <!-- <!– 鍑哄簱浠诲姟 –>-->
+ <!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
+ <!-- select top 1 *-->
+ <!-- from dbo.asr_wrk_mast-->
+ <!-- where (wrk_sts in (11,12)-->
+ <!-- or (wrk_sts in (14,15) and wrk_no in-->
+ <!-- (-->
+ <!-- select wrk_no-->
+ <!-- from asr_bas_devp-->
+ <!-- where wrk_no > 0)-->
+ <!-- ))-->
+ <!-- and io_type != 11-->
+ <!-- and source_sta_no = 180-->
+ <!-- order by io_time,wrk_no-->
+ <!-- </select>-->
<select id="selectCrnWorking" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
@@ -169,13 +173,13 @@
select top 1 *
from dbo.asr_wrk_mast
where (wrk_sts in (11,12)
- or (wrk_sts in (14,15) and wrk_no in
- (
- select wrk_no
- from asr_bas_devp
- where wrk_no > 0)
- ))
- and io_type != 11
+ or (wrk_sts in (14,15) and wrk_no in
+ (
+ select wrk_no
+ from asr_bas_devp
+ where wrk_no > 0)
+ ))
+ and io_type != 11
and source_sta_no = #{sourceStaNo}
order by io_time,wrk_no
</select>
@@ -185,13 +189,22 @@
<select id="selectExistInEmpty" resultType="java.lang.Integer">
SELECT COUNT(*) FROM dbo.asr_wrk_mast Where io_type = 10 and wrk_sts in (1,2,3)
</select>
- <select id="selectTop1" resultType="BaseResultMap">
- select top 1* from dbo.asr_wrk_mast Where 1=1
+ <select id="selectWaitPakIn" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast Where 1=1
and wrk_no in
- <foreach collection="wrkNo" index="index" item="item" open="(" close=")" separator=",">
+ <foreach collection="wrkNos" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
- and wrk_sts == 2
+ and wrk_sts = 2 and io_type in (1,10,53,57)
order by io_pri desc,io_time desc,wrk_no ASC
</select>
+ <select id="selectWrkIoType" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where crn_no=#{crnNo} and wrk_sts=11 and io_type>100
+ order by io_pri desc,io_time ASC,wrk_no ASC
+ </select>
+
+ <select id="selectpj" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
+ </select>
</mapper>
--
Gitblit v1.9.1