zjj
2025-06-30 8b8a2086509e28bb902166aa35e4c287eb906621
#禁止跨层
2个文件已修改
18 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -951,12 +951,12 @@
            }
            //搜索其他楼层充电桩
            List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
                    .notIn(ShuttleChargeSta::getDeviceLev, lev)
                    .eq(ShuttleChargeSta::getStatus, 1));
            if (!list2.isEmpty()) {
                allChargeLoc.addAll(list2);
            }
//            List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
//                    .notIn(ShuttleChargeSta::getDeviceLev, lev)
//                    .eq(ShuttleChargeSta::getStatus, 1));
//            if (!list2.isEmpty()) {
//                allChargeLoc.addAll(list2);
//            }
            //没有找到充电桩
            if (allChargeLoc.isEmpty()) {
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -97,9 +97,9 @@
        resThread = this.searchCurrentLevShuttle(currentLevDevices, locNo);
        //同层没有搜索到合适小车,跨楼层搜索
        if(resThread == null) {
            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
        }
//        if(resThread == null) {
//            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
//        }
        return resThread;
    }