From 0e7e7a9317894a0bac09e1cb83c9be628e8b4ca5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 七月 2023 16:53:13 +0800
Subject: [PATCH] 计算中间点到目标点行走距离
---
src/main/java/com/zy/asrs/utils/Utils.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d862cba..3471267 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -445,7 +445,7 @@
//妫�娴嬬┛姊溅琛岃蛋璺緞锛屾槸鍚﹀瓨鍦ㄥ叾浠栧皬杞︼紝濡傛湁鍏朵粬灏忚溅鍒欒繘琛岃皟绂�
public static boolean checkShuttlePath(List<NavigateNode> nodes, Integer shuttleId) {
- boolean flag = false;
+ boolean flag = false;
int shuttleX = -1;
int shuttleY = -1;
int shuttleZ = -1;
@@ -504,6 +504,11 @@
if (currentShuttleThread == null) {
//娌℃壘鍒板皬杞�
return false;
+ }
+
+ ShuttleProtocol shuttleProtocol = currentShuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle()) {
+ return false;//琚皟搴︾殑灏忚溅澶勪簬宸ヤ綔鐘舵�侊紝绂佹瑙﹀彂閬胯浠诲姟
}
//鎼滅储涓�鏉℃病鏈夊皬杞︾殑绌哄贩閬擄紝骞惰皟搴﹀皬杞�
@@ -582,7 +587,7 @@
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿
assignCommand.setTaskNo((short) commonService.getWorkNo(7));//浠诲姟鍙�
- assignCommand.setTaskMode(ShuttleTaskModeType.MOVE_LOC_NO.id.shortValue());//绉诲姩鍒扮洰鏍囧簱浣�
+ assignCommand.setTaskMode(ShuttleTaskModeType.AVOID.id.shortValue());//閬胯浠诲姟
assignCommand.setSourceLocNo(startLocNo);//婧愬簱浣�
//鍒嗛厤鐩爣搴撲綅
--
Gitblit v1.9.1