#

luxiaotao1123

2025-01-08 36dcec12994c82fffe2a86a6acf12ecbd071fffb

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java

@@ -67,7 +67,7 @@
        String breakPoint = avoidPathList.stream().findFirst().orElse(null);
        List<String> blackList = Utils.singletonList(sponsor);

        Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModelService.getById(agvService.selectByUuid(sponsor).getAgvModel()).getDiameter()
        Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModelService.getByAgvNo(sponsor).getDiameter()
                , MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR);
        List<String> avoidPathListWave = mapService.getWaveScopeByCodeList(lev, avoidPathList, avoidDistance);

@@ -108,7 +108,7 @@
                        if (!Cools.isEmpty(blackList) && blackList.contains(otherWave)) {
                            continue label;
                        }
                        if (1 < mapService.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                        if (mapService.isWalkingByVehicle(lev, otherWave)) {
                            phaseSecond = false;    // there is a running way
                            continue label;
                        } else {
@@ -264,7 +264,7 @@
                            if (!Cools.isEmpty(blackList) && blackList.contains(otherWave)) {
                                continue;
                            }
                            if (1 < mapService.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                            if (mapService.isWalkingByVehicle(lev, otherWave)) {

                                if (null != availablePointOfTurn && actualLanesOfTurn > 0) {
                                    actualLanesOfTurn --;