From 40b06f8935587ad582e70b8aec914fca3f12733a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 13:58:28 +0800
Subject: [PATCH] #优化运行速度
---
src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
index a1e02ae..f55f553 100644
--- a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
+++ b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
@@ -126,7 +126,7 @@
loadGuardState
);
if (stationDispatchLoadSupport.isDispatchBlocked(limitConfig, currentStationTaskCountRef[0], loadGuardState, loopHitResult.isThroughLoop())) {
- return;
+ continue;
}
StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationId, targetStationId, 0);
@@ -185,9 +185,13 @@
stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
if (stationThread != null) {
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
- if (stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo())) {
+ StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
+ boolean arrived = stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo());
+ if (arrived || stationThread.hasRecentArrival(basStation.getStationId(), wrkNo)) {
complete = true;
+ if (!arrived) {
+ News.info("杈撻�佺珯鐐瑰嚭搴撳埌杈惧垽瀹氫娇鐢ㄦ渶杩戝埌绔欒ˉ鍋匡紝宸ヤ綔鍙�={}锛岀洰鏍囩珯={}", wrkNo, targetStaNo);
+ }
}
}
}
--
Gitblit v1.9.1