From 8ad012e177451a736391e478c955949265af08b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 10:56:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleOperaUtils.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
index cba1a01..4e09cb9 100644
--- a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
@@ -78,6 +78,11 @@
assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startLocNo), shuttleNo, allNode, true);//閿佸畾璺緞
+ if (!result) {
+ News.error("{} dash {} can't lock path!", startLocNo, endLocNo);
+ return null;//璺緞閿佸畾澶辫触
+ }
return commands;
}
@@ -143,7 +148,7 @@
/**
* 鑾峰彇鍏呯數鍛戒护
*/
- public synchronized List<ShuttleCommand> shuttleChargeCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean openCharge) {
+ public synchronized List<ShuttleCommand> getShuttleChargeCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean openCharge) {
List<ShuttleCommand> commands = new ArrayList<>();
//鑾峰彇鍏呯數鍛戒护
@@ -152,6 +157,18 @@
return commands;
}
+ /**
+ * 鑾峰彇椤跺崌鍛戒护
+ */
+ public synchronized List<ShuttleCommand> getShuttleLiftCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean lift) {
+ List<ShuttleCommand> commands = new ArrayList<>();
+
+ //鑾峰彇椤跺崌鍛戒护
+ ShuttleCommand command = shuttleThread.getLiftCommand(assignCommand.getDeviceTaskNo(), lift);
+ commands.add(command);
+ return commands;
+ }
+
// private boolean checkSimilarityPath(Motion motion, ShuttleAssignCommand assignCommand) {
// String movePath = motion.getMovePath();
// if (Cools.isEmpty(movePath)) {
--
Gitblit v1.9.1