From db32ffbad65906185ba768a3dc7364337473b1b2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期日, 27 七月 2025 20:48:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/action/ShuttleAction.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/action/ShuttleAction.java b/src/main/java/com/zy/core/action/ShuttleAction.java
index 2fb9616..d25b6cb 100644
--- a/src/main/java/com/zy/core/action/ShuttleAction.java
+++ b/src/main/java/com/zy/core/action/ShuttleAction.java
@@ -158,6 +158,11 @@
//绉诲姩鍛戒护锛岄攣瀹氳矾寰�
if (command.getMode() == ShuttleCommandModeType.MOVE.id) {
+ TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
+ if (trafficControlThread == null) {
+ return false;
+ }
+
List<NavigateNode> nodes = JSON.parseArray(JSON.toJSONString(command.getNodes()), NavigateNode.class);
//鐢宠绠″埗
boolean apply = applyTrafficControl(commands, nodes, shuttleNo, taskNo);
@@ -178,6 +183,7 @@
if (!result) {
News.error("{} device can't lock path!", shuttleNo);
shuttleThread.offerSystemMsg("{} device can't lock path!", shuttleNo);
+ trafficControlThread.trafficReportError(shuttleNo, taskNo);
return false;//璺緞閿佸畾澶辫触
}
}
@@ -411,11 +417,11 @@
return false;
}
if (targetPoints.contains(Utils.getRow(currentLocNo) + "-" + Utils.getBay(currentLocNo))) {
- command.setComplete(true);
boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(shuttleProtocol.getCurrentLocNo()), shuttleProtocol.getShuttleNo(), nodes, false);//瑙ｉ攣璺緞
if (!result) {
return false;//瑙ｉ攣澶辫触
}
+ command.setComplete(true);
}else {
return false;
}
--
Gitblit v1.9.1