#

luxiaotao1123

2024-11-19 504dff5ce99278563ec0a39a6dcb57e7144793d4

#

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

@@ -515,7 +515,21 @@
        if (!Cools.isEmpty(unfinishedOriginJamByCurrAgv)) {
            for (Jam jam : unfinishedOriginJamByCurrAgv) {
                if (!Cools.isEmpty(jam.getJamPath())) {

                    List<String> list = GsonUtils.fromJsonToList(jam.getJamPath(), String.class);

                    Agv jamAgv = agvService.getById(jam.getJamAgv());
                    List<String> jamDynamicNodes = mapDataDispatcher.queryCodeListFromDynamicNode(null, jamAgv.getUuid());
                    // jamDynamicNodes has sorted
                    String firstCodeNode = jamDynamicNodes.stream().findFirst().orElse(null);

                    if (!Cools.isEmpty(firstCodeNode)) {
                        int idx = list.indexOf(firstCodeNode);
                        if (idx != -1) {
                            list = new ArrayList<>(list.subList(idx, list.size()));
                        }
                    }

                    blackPathList.addAll(list);
                }
            }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java

@@ -113,11 +113,7 @@
        }
        // with battery
        if (withBattery) {
            if (agvDetail.getVol() < agv.getChargeLine()) {
                log.warn("[{}]号Agv电量不足......", agv.getUuid());
                return false;
            }
            if (agvDetail.getVol() < agvModel.getLowBattery()) {
            if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
                log.warn("[{}]号Agv电量不足......", agv.getUuid());
                return false;
            }