From 76e29d1cedce4739e48042028264e21a5d310d4c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 十一月 2024 14:26:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 6 ++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java | 3 ---
2 files changed, 6 insertions(+), 3 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 6ca2b01..e2a1d70 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
@@ -222,6 +222,12 @@
// preview path
List<String> draftPath = new ArrayList<>(unlockPathList);
+ if (blockSeverity.equals(BlockSeverityType.SEVERE)) {
+ unlockPathList.remove(endCode.getData());
+ blackPath.addAll(unlockPathList);
+ List<String> list = mapService.checkoutPath(agvNo, startCode, endCode, false, blackPath, segment, blockSeverity);
+ System.out.println(list.size());
+ }
// 鍙蛋琛岃矾寰勯泦鍚堣绠�
List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, draftPath, agvNo, pathList); // jamAgvNo may was wave
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
index cfd22a3..0ebf382 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
@@ -130,9 +130,6 @@
}
if (lanVehicleSet.size() + 1 > maxAgvCountInLane) {
-// if (lock) {
-// continue;
-// }
continue;
}
}
--
Gitblit v1.9.1