From 83b653947b73a9df562ab909921b6bac798f29de Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 31 十二月 2025 17:02:19 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index e9690a7..a10ea6c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -696,12 +696,13 @@
if (!blockVehicleDto.isAvoidable()) {
continue;
}
+ Long agvId = agvService.getAgvId(blockVehicleDto.getVehicle());
// 褰撳墠vehicle姝ｅ湪杩涜閬胯浣滀笟
- if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(blockVehicleDto.getVehicle(), null))) {
+ if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(agvId, null))) {
continue;
}
// 褰撳墠vehicle姝ｅ湪杩涜婊氱瓛杈撻�佺嚎绛夊緟
- if () {
+ if (segmentService.isRollerWaiting(agvId)) {
continue;
}
return blockVehicleDto.getVehicle();
--
Gitblit v1.9.1