From b7b4510ab85d9c3a31645f56e3d799ad817d9762 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 30 九月 2025 08:36:43 +0800
Subject: [PATCH] 订单不转历史
---
src/main/resources/mapper/WrkMastMapper.xml | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 01480d8..61a40ea 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -101,18 +101,34 @@
</select>
<select id="selectPakoutOfStaNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where 1=1
- and crn_no = 2
- and wrk_sts in (11,12,13,14,15,16,17)
- and source_sta_no = #{staNo}
- and io_type in (101.103,104,107,110)
- union
- select top 1 * from asr_wrk_mast where 1=1
- and wrk_sts in (17,18)
- and io_type in (101.103,104,107,110)
- and wrk_no in (
- select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
- )
+ select top 1 * from (
+ select top 1 * from asr_wrk_mast where 1=1
+ and crn_no = 2
+ and wrk_sts in (12,13,14,15,16)
+ and source_sta_no = #{staNo}
+ and io_type in (101.103,104,107,110)
+ union
+ select top 1 * from asr_wrk_mast where 1=1
+ and wrk_sts in (17,18)
+ and io_type in (101.103,104,107,110)
+ and wrk_no in (
+ select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
+ )
+ ) a
+
+ </select>
+
+ <select id="selectSameWrkMast" resultMap="BaseResultMap">
+ select wm.* from asr_wrk_mast wm
+ left join asr_loc_mast lm
+ on lm.loc_no = wm.loc_no
+ left join asr_wrk_detl wd
+ on wd.wrk_no = wm.wrk_no
+ where io_type=1
+ and wrk_sts < 11
+ and lm.loc_sts = 'S'
+ and wd.matnr = #{matnr}
+ ORDER BY wm.wrk_no desc
</select>
</mapper>
--
Gitblit v1.9.1