From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index 5b0240c..ae3b643 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -71,7 +71,7 @@
@Autowired
private LocService locService;
@Autowired
- private AgvModelService agvModelService;
+ private TravelService travelService;
@Autowired
private TransferStationHandler transferStationHandler;
@@ -122,8 +122,10 @@
.eq(Segment::getState, SegmentStateType.WAITING.toString())
);
for (Segment segment : segments) {
- if (!transferStationHandler.hasDelayAtSta(segment)) {
+ if (transferStationHandler.hasDelayAtSta(segment)) {
continue;
+ } else {
+ travelService.clearRollerWaiting(segment.getTravelId());
}
try {
txTemplate.executeWithoutResult(status -> {
--
Gitblit v1.9.1