From 4abd8cccff6c2379b2cbe2452dd86fae27499557 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 19 三月 2026 23:02:16 +0800
Subject: [PATCH] 出库校验在途任务和组托
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
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 87c7e52..7c1891a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -84,6 +85,8 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WaitPakinMapper waitPakinMapper;
@Autowired
private ConfigService configService;
@Autowired
@@ -548,10 +551,21 @@
// if (!staProtocol.isOutEnable()) {
// return;
// }
-
- //妫�鏌ユ槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔�
- List<WrkMast> workingWrkMast = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", 3, 12));
- if (!workingWrkMast.isEmpty()) {
+ // 缁勬墭妗ｅ瓨鍦ㄥ凡缁勬墭鏈叆搴撳垯绛夊緟锛屼笉涓嬪彂鍑哄簱
+ int waitPakinNotIn = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>()
+ .isNull("io_status").or().ne("io_status", "Y"));
+ if (waitPakinNotIn > 0) {
+ return;
+ }
+ // 瀛樺湪杩涜涓�/鍦ㄩ�斾换鍔�(2,3,12,13,14)鍒欎笉涓嬪彂鍑哄簱锛岄伩鍏嶅啿绐�
+ // 2 寰呮墽琛岋紙鍏ュ簱锛�
+ //3 璁惧鎵ц涓紙鍏ュ簱锛�
+ //12 璁惧鎵ц涓紙鍑哄簱锛�
+ //13 鍑哄簱鍒扮珯鐐逛笂
+ //14 鍑哄簱绛夊緟纭
+ int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 2, 3, 12, 13, 14));
+ if (activeCount > 0) {
return;
}
--
Gitblit v1.9.1