gtsxc
2025-02-28 16f5e8d67c29b726bf07e790da3214d72eb0e053
#搜索空闲小车地图改为DFX,增加车辆有没有被任务绑定判断
1个文件已修改
15 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -144,6 +144,12 @@
            }
            // 有没有被其他任务调度
            List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
            if (!taskList.isEmpty()) {
                continue;
            }
            int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//小车当前层高
            String currentLocNo = shuttleProtocol.getCurrentLocNo();//小车当前库位号
@@ -157,7 +163,7 @@
            List<NavigateNode> currentShuttlePath = navigateUtils.calc(
                    currentLocNo
                    , locNo
                    , NavigationMapType.NORMAL.id
                    , NavigationMapType.DFX.id
                    , Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
            );//搜索空闲穿梭车,使用正常通道地图
            if (currentShuttlePath == null) {
@@ -228,6 +234,11 @@
                }
                // 有没有被其他任务调度
                List<Task> taskList = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()), null);
                if (!taskList.isEmpty()) {
                    continue;
                }
                int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//小车当前层高
                String currentLocNo = shuttleProtocol.getCurrentLocNo();//小车当前库位号
@@ -254,7 +265,7 @@
                List<NavigateNode> currentShuttlePath = navigateUtils.calc(
                        currentLocNo
                        , targetLocNo
                        , NavigationMapType.NORMAL.id
                        , NavigationMapType.DFX.id
                        , Utils.getShuttlePoints(Integer.parseInt(shuttleThread.getDevice().getDeviceNo()), currentLev)
                );//搜索空闲穿梭车,使用正常通道地图
                if (currentShuttlePath == null) {