From 61eeadd816f66802fa25b226a928e7d9af68e4e5 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 06 十月 2023 11:54:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 3 +++ src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index 72821fa..393f21e 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -428,6 +428,9 @@ continue;//妤煎眰涓嶅悓 } + if (shuttleProtocol.getCurrentLocNo() == null) { + continue; + } int[] xyPosition = NavigatePositionConvert.positionToXY(shuttleProtocol.getCurrentLocNo());//閫氳繃搴撲綅鍙疯幏鍙杧y鍧愭爣 list.add(xyPosition); } diff --git a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java index a4bc2e7..cf52c25 100644 --- a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java +++ b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java @@ -87,7 +87,7 @@ */ public static NyShuttleOperaResult getStartToTargetCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint, Integer mapType) { //璁$畻璧风偣鍒扮洰鏍囩偣琛岃蛋鑺傜偣 - List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, mapType, Utils.getShuttlePoints(shuttleNo, Utils.getLev(targetPoint))); + List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, mapType, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startPoint))); if (calc == null) { return null; } -- Gitblit v1.9.1