1

zhang

9 天以前 fd0dc8eec755272d9b5adfd58369195db55173c4

1

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

@@ -1244,10 +1244,13 @@
                        sortedList.add(actionList.get(i));
                    }
                }
                Action action = actionList.get(lastActionIndex);
                action.setActionSts(ActionStsType.NEXT.val());
                actionService.updateById(action);
                actionList = sortedList;
            }

            Action shang = actionService.getOne(new LambdaQueryWrapper<Action>().eq(Action::getAgvId, agvId).eq(Action::getActionSts, ActionStsType.PREPARE.val()).eq(Action::getActionType, ActionTypeType.ReadyReleaseToAgvSite.val()).orderByDesc(Action::getId));
            Action shang = actionService.getOne(new LambdaQueryWrapper<Action>().eq(Action::getAgvId, agvId).eq(Action::getActionSts, ActionStsType.NEXT.val()).eq(Action::getActionType, ActionTypeType.ReadyReleaseToAgvSite.val()).ne(Action::getGroupId,actionGroupId));
            if (shang != null) {
                int turnCornerIdx = actionSorter.findFirstActionIndex(actionList, ActionTypeType.TurnCorner.val());
                if (turnCornerIdx == -1) {

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

@@ -384,6 +384,10 @@

                                // block vehicle info
                                Long blockAgvId = agvService.getAgvId(blockAgvNo);
                                if (agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()==null){
                                   log.info(blockAgvNo + "小车不在定位");
                                   return null;
                                }
                                String blockAgvCode = codeService.getCacheById(agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()).getData();

                                // create new jam if already notify the avoid vehicle

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java

@@ -14,6 +14,7 @@
    ISSUED,
    FINISH,
    EXPIRED,
    NEXT,
    ;

    ActionStsType() {