From 0a9c9bf4fa908d9d0bbdd910b70fcd0650e0df1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 22:46:30 +0800
Subject: [PATCH] #出库输送执行
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index ee42d03..5c852ad 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Component
public class StationOperateProcessUtils {
@@ -423,6 +424,9 @@
if (stationId == null) {
continue;
}
+ if (!isIdleRecoverCandidateStation(basDevp, stationId)) {
+ continue;
+ }
if (!stationProtocol.isAutoing()
|| !stationProtocol.isLoading()
|| stationProtocol.getTaskNo() <= 0
@@ -460,6 +464,27 @@
return stationRerouteProcessor.shouldUseRunBlockDirectReassign(wrkMast, stationId, runBlockReassignLocStationList);
}
+ public boolean isIdleRecoverCandidateStation(BasDevp basDevp, Integer stationId) {
+ if (basDevp == null || stationId == null) {
+ return false;
+ }
+ return !containsStation(basDevp.getBarcodeStationList$(), stationId)
+ && !containsStation(basDevp.getInStationList$(), stationId)
+ && !containsStation(basDevp.getOutStationList$(), stationId);
+ }
+
+ private boolean containsStation(List<StationObjModel> stationList, Integer stationId) {
+ if (stationList == null || stationList.isEmpty() || stationId == null) {
+ return false;
+ }
+ for (StationObjModel stationObjModel : stationList) {
+ if (stationObjModel != null && Objects.equals(stationObjModel.getStationId(), stationId)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
return stationRerouteProcessor.shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId);
}
--
Gitblit v1.9.1