From 81188cbe3d51e951ce4c853edb886272a4eb51a3 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 11 十二月 2024 15:59:00 +0800 Subject: [PATCH] #path similarity --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/MapCommandService.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/MapCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/MapCommandService.java index dfbebb8..7acdbac 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/MapCommandService.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/MapCommandService.java @@ -4,6 +4,7 @@ import com.zy.asrs.wcs.core.entity.Motion; import com.zy.asrs.wcs.core.model.MapNode; import com.zy.asrs.wcs.core.model.NavigateNode; +import com.zy.asrs.wcs.core.model.enums.MapNodeType; import com.zy.asrs.wcs.core.model.enums.MotionCtgType; import com.zy.asrs.wcs.core.model.enums.NavigationMapType; import com.zy.asrs.wcs.core.utils.*; @@ -124,12 +125,16 @@ for (NavigateNode node : nodes) { List<MapNode> listX = map.get(node.getX()); MapNode mapNode = listX.get(node.getY()); + if (mapNode.getLockDeviceNo() != null && !mapNode.getLockDeviceNo().equals(shuttleProtocol.getShuttleNo())) { + return false;//璺緞鎵�灞炴潈涓嶆槸褰撳墠璁惧 + } + if (lock) {//妫�娴嬫槸鍚﹂攣瀹� - if (mapNode.getValue() != -999) { + if (!mapNode.getValue().equals(MapNodeType.LOCK.id)) { return false;//璺緞鏈攣瀹� } }else {//妫�娴嬫槸鍚︽湭閿佸畾 - if(mapNode.getValue() == -999) { + if(mapNode.getValue().equals(MapNodeType.LOCK.id)) { return false;//璺緞宸查攣瀹� } } -- Gitblit v1.9.1