From f55ba9203e378212ca3be9710b85cb91f04e7ca7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 15 三月 2023 16:21:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 8 ++++++++
src/main/resources/mapper/WrkMastMapper.xml | 4 ++++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 4685cbd..f1b73e2 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -101,6 +101,14 @@
*/
List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ /**
+ * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊凡鍑哄簱宸ヤ綔妗�
+ * @param crnNO
+ * @param sourceStaNo
+ * @return
+ */
+ WrkMast selectPakOutStep14(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 64db69b..4169bfe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -872,6 +872,11 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
+ // 鑾峰彇宸ヤ綔鐘舵�佷负14鐨勫伐浣滄。
+ WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
+ if (wrkMast1.getIoType().equals(103) || wrkMast1.getIoType().equals(107) ) {
+ continue;
+ }
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d078984..c39dff6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -160,6 +160,10 @@
select * 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>
+ <select id="selectPakOutStep14" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=14 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ </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 = #{sourceStaNo} order by io_time,wrk_no
--
Gitblit v1.9.1