From fd0dc8eec755272d9b5adfd58369195db55173c4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 25 六月 2025 10:36:12 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 8 ++++++--
1 files changed, 6 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 775f301..0921679 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
@@ -100,7 +100,7 @@
long endNode = segment.getEndNode();
// valid ----------------------------------------------------
- if (!agvService.judgeEnable(agv.getId())) {
+ if (!agvService.judgeEnable(agv.getId(),false,true)) {
return;
}
@@ -384,6 +384,10 @@
// block vehicle info
Long blockAgvId = agvService.getAgvId(blockAgvNo);
+ if (agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()==null){
+ log.info(blockAgvNo + "灏忚溅涓嶅湪瀹氫綅");
+ return null;
+ }
String blockAgvCode = codeService.getCacheById(agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()).getData();
// create new jam if already notify the avoid vehicle
@@ -601,7 +605,7 @@
} else {
- return mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, endCodeData, jam);
+ return mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, endCodeData, jam, false);
}
return true;
--
Gitblit v1.9.1