From 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 十一月 2024 09:24:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 6 ++++--
1 files changed, 4 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 70dec0e..8a5d41f 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
@@ -93,7 +93,7 @@
if (!Cools.isEmpty(waitingSegList)) {
for (Segment waitingSeg : waitingSegList) {
if (!waitingSeg.getId().equals(segment.getId())) {
- log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
+// log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
return;
}
}
@@ -453,11 +453,13 @@
if (!segmentService.save(insertSeg)) {
log.error("Segment [{}] 淇濆瓨澶辫触 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
return false;
+ } else {
+ jam.setAvoSeg(insertSeg.getId());
}
} else {
- return mainLockWrapService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
+ return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
}
return true;
--
Gitblit v1.9.1