#
luxiaotao1123
2024-11-26 76e29d1cedce4739e48042028264e21a5d310d4c
#
2个文件已修改
9 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -222,6 +222,12 @@
            // preview path
            List<String> draftPath = new ArrayList<>(unlockPathList);
            if (blockSeverity.equals(BlockSeverityType.SEVERE)) {
                unlockPathList.remove(endCode.getData());
                blackPath.addAll(unlockPathList);
                List<String> list = mapService.checkoutPath(agvNo, startCode, endCode, false, blackPath, segment, blockSeverity);
                System.out.println(list.size());
            }
            // 可走行路径集合计算
            List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, draftPath, agvNo, pathList);    // jamAgvNo may was wave
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java
@@ -130,9 +130,6 @@
                    }
                    if (lanVehicleSet.size() + 1 > maxAgvCountInLane) {
//                        if (lock) {
//                            continue;
//                        }
                        continue;
                    }
                }