From 186432933336d96c19402c5aee61064df4a7390a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:43:09 +0800
Subject: [PATCH] 完成调试
---
src/main/resources/mapper/WrkMastMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 2bda822..d6c0036 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -86,10 +86,14 @@
<select id="selectPakInStep1" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
</select>
+ <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
+ </select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
</select>
+
<select id="selectPakInStep2" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 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
@@ -109,6 +113,10 @@
<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>
+
+ <select id="selectPakOutStep3" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
@@ -180,6 +188,13 @@
order by io_time,wrk_no
</select>
<select id="selectPakoutEmpty" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (11,12,13,14) and io_type != 11 and sta_no = #{staNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
+ </select>
+ <select id="selectPickStep2" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where barcode = #{barcode} and (wrk_sts=14 and io_type=107) or (wrk_sts=2 and io_type=57)
+ </select>
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_no = #{wrkNo}
</select>
</mapper>
--
Gitblit v1.9.1