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

@@ -34,6 +34,7 @@
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.manager.service.impl.LocStsServiceImpl;
import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
import com.zy.acs.manager.manager.utils.ActionSorter;
import com.zy.acs.manager.system.service.ConfigService;
@@ -764,11 +765,18 @@

            boolean first = true;
            for (Segment segment : segmentList) {

                // 分段所属的Task
                Task task = taskService.getById(segment.getTaskId());
                TaskPosDto.PosType posType = Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()));
                boolean isStation = posType.equals(TaskPosDto.PosType.ORI_STA) || posType.equals(TaskPosDto.PosType.DEST_STA);
                boolean isLoc = posType.equals(TaskPosDto.PosType.ORI_LOC) || posType.equals(TaskPosDto.PosType.DEST_LOC);
                // 目标是否为站点
                boolean isStation = posType == TaskPosDto.PosType.ORI_STA || posType == TaskPosDto.PosType.DEST_STA;
                // 目标是否为库位
                boolean isLoc = posType == TaskPosDto.PosType.ORI_LOC || posType == TaskPosDto.PosType.DEST_LOC;
                // 站点地码
                List<String> turnCodes = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054");
                // 库位地码
                List<String> locTurnCodes = Arrays.asList("00000080", "00000081", "00000082", "00000083", "00000084");
                // 节点条码
                Code code = codeService.getCacheById(segment.getEndNode());

@@ -791,8 +799,8 @@
                        // 第一步：如果下一个方向正好是作业方向的相反方向，则重置下一个方向为作业方向，标记 reverse = true
                        boolean reverse = false;
                        if (nextDirection.equals((workDirection + 180) % 360)) {
                            List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                            if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                            if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                            // if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                reverse = false;
                                lastDirection = nextDirection;
                            } else {
@@ -819,7 +827,8 @@
                                    nextDirection = lastDirection;
                                    reverse = true;
                                } else {
                                    if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                    if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                    // if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                        // turn
                                        reverse = false;
                                        actionList.add(new Action(
@@ -844,10 +853,10 @@
                                                nextDirection,
                                                180);
                                    } else {
                                        List<String> list = Arrays.asList("00000051", "00000052", "00000053", "00000054");
                                        Double turnDirection = nextDirection;
                                        if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                                        if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                            turnDirection = 180.0;
                                            reverse = false;
                                        }
                                        // turn
                                        actionList.add(new Action(
@@ -870,12 +879,14 @@
                                                lastCode.getData(),
                                                lastCode.getCornerBool(),
                                                nextDirection,
                                                nextDirection);
                                                lastDirection);
                                    }
                                    lastDirection = nextDirection;
                                }
                            } else {
                                if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                // if (isStation && lastCode.getData().equals("00000050")) {
                                if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                // if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                    // turn
                                    reverse = false;
                                    actionList.add(new Action(
@@ -893,6 +904,7 @@
                                            agvId,    // AGV
                                            now    // 工作时间
                                    ));

                                    log.info("3TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                            posType,
                                            lastCode.getData(),
@@ -962,8 +974,11 @@
                if (first) {
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        Double turnDirection = workDirection;
                        List<String> list = Arrays.asList("00000050","00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                        if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                        Code nextCode = codeService.getCacheByData(lastCode.getData());
//                        Double nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
                        // if (isStation && turnCodes.contains(lastCode.getData())) {
                        if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                        // if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(lastCode.getData()))) {
                            turnDirection = workDirection + 180.0;
                        }
                        if (lastCode.getCornerBool()) {
@@ -1394,24 +1409,25 @@
        }
    }


    /**
     * 根据分片生成动作 ( 车辆可能已经做过一些任务了,正在等待下一段任务 )
     */
    @Transactional
    public synchronized void generateActionV2(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
    public synchronized void generateActionV2(Long agvId, List<Segment> segmentList, List<String> pathList,
            Date algoStartTime) {
        try {
            if (Cools.isEmpty(agvId, segmentList)) {
                return;
            }
            Date now = new Date();
            long actionPrepareSts = ActionStsType.PREPARE.val();
//            JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
            // JSONObject storeDirection = configService.getVal("storeDirection",
            // JSONObject.class);
            int angleOffsetVal = configService.getVal("mapAngleOffsetVal", Integer.class);
            String agvNo = agvService.getAgvNo(agvId);
//            if (!agvService.judgeEnable(agvId)) {
//                throw new CoolException("AGV[" + agvNo + "]当前不可用...");
//            }
            // if (!agvService.judgeEnable(agvId)) {
            // throw new CoolException("AGV[" + agvNo + "]当前不可用...");
            // }

            AgvModel agvModel = agvModelService.getByAgvId(agvId);
            Double workDirection = agvModel.getWorkDirection();
@@ -1519,24 +1535,23 @@
                            }
                        }


                        // 第一个动作一定是 turn
                        if (actionList.isEmpty()) {
                            // turn
                            actionList.add(new Action(
                                    null,    // 编号
                                    task.getBusId(),    // 总线
                                    task.getId(),    // 任务
                                    null,    // 动作号
                                    null,    // 优先级
                                    ActionTypeType.TurnCorner.desc,    // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 属性值
                                    lastCode.getData(),    // 地面码
                                    String.valueOf(nextDirection),   // 动作参数
                                    ActionTypeType.TurnCorner.val(),    // 动作类型
                                    actionPrepareSts,    // 动作进度
                                    agvId,    // AGV
                                    now    // 工作时间
                                    null, // 编号
                                    task.getBusId(), // 总线
                                    task.getId(), // 任务
                                    null, // 动作号
                                    null, // 优先级
                                    ActionTypeType.TurnCorner.desc, // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 属性值
                                    lastCode.getData(), // 地面码
                                    String.valueOf(nextDirection), // 动作参数
                                    ActionTypeType.TurnCorner.val(), // 动作类型
                                    actionPrepareSts, // 动作进度
                                    agvId, // AGV
                                    now // 工作时间
                            ));

                            lastDirection = nextDirection;
@@ -1549,19 +1564,19 @@
                        }
                        CodeGap gap = codeGapService.findByCodeOfBoth(lastCode.getId(), nextCode.getId());
                        actionList.add(new Action(
                                null,    // 编号
                                task.getBusId(),    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                actionType.desc,    // 名称
                                (double) agvSpeedType.val,    // 属性值
                                lastCode.getData(),    // 地面码
                                String.valueOf(gap.getDistance()),   // 动作参数
                                actionType.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                null, // 编号
                                task.getBusId(), // 总线
                                task.getId(), // 任务
                                null, // 动作号
                                null, // 优先级
                                actionType.desc, // 名称
                                (double) agvSpeedType.val, // 属性值
                                lastCode.getData(), // 地面码
                                String.valueOf(gap.getDistance()), // 动作参数
                                actionType.val(), // 动作类型
                                actionPrepareSts, // 动作进度
                                agvId, // AGV
                                now // 工作时间
                        ));

                        lastCode = nextCode;
@@ -1572,22 +1587,23 @@

                // 初始方向值补丁
                if (first) {
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                    if (Cools.isEmpty(actionList)
                            || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        // turn
                        actionList.add(new Action(
                                null,    // 编号
                                task.getBusId(),    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.TurnCorner.desc,    // 名称
                                mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 属性值
                                lastCode.getData(),    // 地面码
                                String.valueOf(workDirection),   // 动作参数
                                ActionTypeType.TurnCorner.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                null, // 编号
                                task.getBusId(), // 总线
                                task.getId(), // 任务
                                null, // 动作号
                                null, // 优先级
                                ActionTypeType.TurnCorner.desc, // 名称
                                mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 属性值
                                lastCode.getData(), // 地面码
                                String.valueOf(workDirection), // 动作参数
                                ActionTypeType.TurnCorner.val(), // 动作类型
                                actionPrepareSts, // 动作进度
                                agvId, // AGV
                                now // 工作时间
                        ));

                        lastDirection = workDirection;
@@ -1761,59 +1777,59 @@
                            }
                            // turn
                            actionList.add(new Action(
                                    null,    // 编号
                                    task.getBusId(),    // 总线
                                    task.getId(),    // 任务
                                    null,    // 动作号
                                    null,    // 优先级
                                    ActionTypeType.TurnCorner.desc,    // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 属性값
                                    lastCode.getData(),    // 地面码
                                    String.valueOf(destStaWorkDirection),   // 动作参数
                                    ActionTypeType.TurnCorner.val(),    // 动作类型
                                    actionPrepareSts,    // 动作进度
                                    agvId,    // AGV
                                    now   // 工作时间
                                    null, // 编号
                                    task.getBusId(), // 总线
                                    task.getId(), // 任务
                                    null, // 动作号
                                    null, // 优先级
                                    ActionTypeType.TurnCorner.desc, // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 属性값
                                    lastCode.getData(), // 地面码
                                    String.valueOf(destStaWorkDirection), // 动作参数
                                    ActionTypeType.TurnCorner.val(), // 动作类型
                                    actionPrepareSts, // 动作进度
                                    agvId, // AGV
                                    now // 工作时间
                            ));
                            lastDirection = destStaWorkDirection;
                        }
                        // 暂存点取货
                        assert backpackType != null;
                        actionList.add(new Action(
                                null,    // 编号
                                task.getBusId(),    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.ReadyTakeFromAgvSite.desc,    // 名称
                                (double) backpackType.lev,    // 属性값
                                lastCode.getData(),    // 地面码
                                String.valueOf(backpackType.height),   // 动作参数
                                ActionTypeType.ReadyTakeFromAgvSite.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                null, // 编号
                                task.getBusId(), // 总线
                                task.getId(), // 任务
                                null, // 动作号
                                null, // 优先级
                                ActionTypeType.ReadyTakeFromAgvSite.desc, // 名称
                                (double) backpackType.lev, // 属性값
                                lastCode.getData(), // 地面码
                                String.valueOf(backpackType.height), // 动作参数
                                ActionTypeType.ReadyTakeFromAgvSite.val(), // 动作类型
                                actionPrepareSts, // 动作进度
                                agvId, // AGV
                                now // 工作时间

                        ));
                        // 计算货叉工作方向
                        staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection, lastDirection);
                        staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection,
                                lastDirection);
                        actionList.add(new Action(
                                null,    // 编号
                                task.getBusId(),    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.ReadyReleaseToConveyorSta.desc,    // 名称
                                staWorkDirection,    // 属性값
                                lastCode.getData(),    // 地面码
                                String.valueOf(destSta.getOffset()),   // 动作参数
                                ActionTypeType.ReadyReleaseToConveyorSta.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now,    // 工作时间
                                null, // 编号
                                task.getBusId(), // 总线
                                task.getId(), // 任务
                                null, // 动作号
                                null, // 优先级
                                ActionTypeType.ReadyReleaseToConveyorSta.desc, // 名称
                                staWorkDirection, // 属性값
                                lastCode.getData(), // 地面码
                                String.valueOf(destSta.getOffset()), // 动作参数
                                ActionTypeType.ReadyReleaseToConveyorSta.val(), // 动作类型
                                actionPrepareSts, // 动作进度
                                agvId, // AGV
                                now, // 工作时间
                                destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
                                destSta.getStaNo()
                        ));
                                destSta.getStaNo()));
                        break;
                    case TO_CHARGE:
                        // 检验方向
@@ -1821,61 +1837,61 @@
                        Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
                        if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
                            actionList.add(new Action(
                                    null,    // 编号
                                    null,    // 总线
                                    task.getId(),    // 任务
                                    null,    // 动作号
                                    null,    // 优先级
                                    ActionTypeType.TurnCorner.desc,    // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 属性값
                                    lastCode.getData(),    // 地面码
                                    String.valueOf(chargeDirection),   // 动作参数
                                    ActionTypeType.TurnCorner.val(),    // 动作类型
                                    actionPrepareSts,    // 动作进度
                                    agvId,    // AGV
                                    now    // 工作时间
                                    null, // 编号
                                    null, // 总线
                                    task.getId(), // 任务
                                    null, // 动作号
                                    null, // 优先级
                                    ActionTypeType.TurnCorner.desc, // 名称
                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 属性값
                                    lastCode.getData(), // 地面码
                                    String.valueOf(chargeDirection), // 动作参数
                                    ActionTypeType.TurnCorner.val(), // 动作类型
                                    actionPrepareSts, // 动作进度
                                    agvId, // AGV
                                    now // 工作时间
                            ));
                            lastDirection = chargeDirection;
                        }

                        // charge
                        actionList.add(new Action(
                                null,    // 编号
                                null,    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.DockingCharge.desc,    // 名称
                                null,    // 属性값
                                lastCode.getData(),    // 地面码
                                null,   // 动作参数
                                ActionTypeType.DockingCharge.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                null, // 编号
                                null, // 总线
                                task.getId(), // 任务
                                null, // 动作号
                                null, // 优先级
                                ActionTypeType.DockingCharge.desc, // 名称
                                null, // 属性값
                                lastCode.getData(), // 地面码
                                null, // 动作参数
                                ActionTypeType.DockingCharge.val(), // 动作类型
                                actionPrepareSts, // 动作进度
                                agvId, // AGV
                                now // 工作时间
                        ));
                        break;
                    case TO_STANDBY:
//                        FuncSta standByFuncSta = funcStaService.query(agvId, lastCode.getId(), 2);
//                        Double standByDirection = Double.parseDouble(standByFuncSta.getAngle());
//                        if (!lastDirection.equals(standByDirection)) {
//                            actionList.add(new Action(
//                                    null,    // 编号
//                                    null,    // 总线
//                                    task.getId(),    // 任务
//                                    null,    // 动作号
//                                    null,    // 优先级
//                                    ActionTypeType.TurnCorner.desc,    // 名称
//                                    null,    // 属性값
//                                    lastCode.getData(),    // 地面码
//                                    String.valueOf(standByDirection),   // 动作参数
//                                    ActionTypeType.TurnCorner.val(),    // 动作类型
//                                    actionPrepareSts,    // 动作进度
//                                    agvId,    // AGV
//                                    now    // 工作时间
//                            ));
//                            lastDirection = standByDirection;
//                        }
                        // FuncSta standByFuncSta = funcStaService.query(agvId, lastCode.getId(), 2);
                        // Double standByDirection = Double.parseDouble(standByFuncSta.getAngle());
                        // if (!lastDirection.equals(standByDirection)) {
                        // actionList.add(new Action(
                        // null, // 编号
                        // null, // 总线
                        // task.getId(), // 任务
                        // null, // 动作号
                        // null, // 优先级
                        // ActionTypeType.TurnCorner.desc, // 名称
                        // null, // 属性값
                        // lastCode.getData(), // 地面码
                        // String.valueOf(standByDirection), // 动作参数
                        // ActionTypeType.TurnCorner.val(), // 动作类型
                        // actionPrepareSts, // 动作进度
                        // agvId, // AGV
                        // now // 工作时间
                        // ));
                        // lastDirection = standByDirection;
                        // }
                        String runToWaitHeightFlag = configService.getVal("RunToWaitHeightFlag", String.class);
                        if (!Cools.isEmpty(runToWaitHeightFlag) && runToWaitHeightFlag.contains(agvId.toString())) {
                            String runToWaitHeight = configService.getVal("RunToWaitHeight", String.class);
@@ -1891,19 +1907,19 @@
                                throw new BusinessException("AGV定位信息异常，无法生成待机动作");
                            }
                            actionList.add(new Action(
                                    null,    // 编号
                                    task.getBusId(),    // 总线
                                    task.getId(),    // 任务
                                    null,    // 动作号
                                    null,    // 优先级
                                    ActionTypeType.RunToWaitHeight.desc,    // 名称
                                    runToWaitHeightValue,    // 属性값
                                    lastCode.getData(),    // 地面码
                                    runToWaitHeight,   // 动作参数
                                    ActionTypeType.RunToWaitHeight.val(),    // 动作类型
                                    actionPrepareSts,    // 动作进度
                                    agvId,    // AGV
                                    now    // 工作时间
                                    null, // 编号
                                    task.getBusId(), // 总线
                                    task.getId(), // 任务
                                    null, // 动作号
                                    null, // 优先级
                                    ActionTypeType.RunToWaitHeight.desc, // 名称
                                    runToWaitHeightValue, // 属性값
                                    lastCode.getData(), // 地面码
                                    runToWaitHeight, // 动作参数
                                    ActionTypeType.RunToWaitHeight.val(), // 动作类型
                                    actionPrepareSts, // 动作进度
                                    agvId, // AGV
                                    now // 工作时间
                            ));
                        }
                        break;
@@ -2161,98 +2177,108 @@
            if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_SHELVES_COMPLETE)) {
                WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();

//                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
//                if (null == loc) {
//                    log.warn("Agv [{}] 上报往货架放货完成时，库位码[{}]无效。", protocol.getAgvNo(), agv_11_up.getLocCode());
//                } else {
//                    List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                    for (Long taskId : taskIds) {
//                        Task task = taskService.getById(taskId);
//                        if (task.getDestLoc().equals(loc.getId())) {
//
//                            Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
//                                    .eq(Action::getTaskId, task.getId())
//                                    .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
//                                    .eq(Action::getActionSts, ActionStsType.ISSUED.val())
//                            );
//
//                            if (null != action) {
//                                action.setActionSts(ActionStsType.FINISH.val());
//                                action.setEndTime(now);
//                                action.setUpdateTime(now);
//                                if (!actionService.updateById(action)) {
//                                    log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " + action.getName());
//                                }
//                            }
//                            //插入一条
//                            report(task, TaskReportStsType.END);
//                        }
//                    }
//                }
                // Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode,
                // String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
                // if (null == loc) {
                // log.warn("Agv [{}] 上报往货架放货完成时，库位码[{}]无效。", protocol.getAgvNo(),
                // agv_11_up.getLocCode());
                // } else {
                // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
                // for (Long taskId : taskIds) {
                // Task task = taskService.getById(taskId);
                // if (task.getDestLoc().equals(loc.getId())) {
                //
                // Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
                // .eq(Action::getTaskId, task.getId())
                // .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
                // .eq(Action::getActionSts, ActionStsType.ISSUED.val())
                // );
                //
                // if (null != action) {
                // action.setActionSts(ActionStsType.FINISH.val());
                // action.setEndTime(now);
                // action.setUpdateTime(now);
                // if (!actionService.updateById(action)) {
                // log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " +
                // action.getName());
                // }
                // }
                // //插入一条
                // report(task, TaskReportStsType.END);
                // }
                // }
                // }

//                List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                for (Long taskId : taskIds) {
//                    Task task = taskService.getById(taskId);
//                    report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
//                }
                // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
                // for (Long taskId : taskIds) {
                // Task task = taskService.getById(taskId);
                // report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
                // }
            }

            // 出库取货
            if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_SHELVES_COMPLETE)) {
                WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();

//                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
//                if (null == loc) {
//                    log.warn("Agv [{}] 上报从货架取货完成，库位码[{}]无效。", protocol.getAgvNo(), agv_11_up.getLocCode());
//                } else {
//
//                    List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                    for (Long taskId : taskIds) {
//                        Task task = taskService.getById(taskId);
//                        if (task.getOriLoc().equals(loc.getId())) {
//
//                            Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
//                                    .eq(Action::getTaskId, task.getId())
//                                    .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
//                                    .eq(Action::getActionSts, ActionStsType.ISSUED.val())
//                            );
//                            if (null != action) {
//                                action.setActionSts(ActionStsType.FINISH.val());
//                                action.setEndTime(now);
//                                action.setUpdateTime(now);
//                                if (!actionService.updateById(action)) {
//                                    log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " + action.getName());
//                                }
//                            }
//                            report(task, TaskReportStsType.OTBIN);
//                        }
//                    }
//                }
//                List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                for (Long taskId : taskIds) {
//                    Task task = taskService.getById(taskId);
//                    report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
//                }
                // Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode,
                // String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
                // if (null == loc) {
                // log.warn("Agv [{}] 上报从货架取货完成，库位码[{}]无效。", protocol.getAgvNo(),
                // agv_11_up.getLocCode());
                // } else {
                //
                // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
                // for (Long taskId : taskIds) {
                // Task task = taskService.getById(taskId);
                // if (task.getOriLoc().equals(loc.getId())) {
                //
                // Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
                // .eq(Action::getTaskId, task.getId())
                // .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
                // .eq(Action::getActionSts, ActionStsType.ISSUED.val())
                // );
                // if (null != action) {
                // action.setActionSts(ActionStsType.FINISH.val());
                // action.setEndTime(now);
                // action.setUpdateTime(now);
                // if (!actionService.updateById(action)) {
                // log.error("Action [{}] 更新失败 ！！！", action.getPriority() + " - " +
                // action.getName());
                // }
                // }
                // report(task, TaskReportStsType.OTBIN);
                // }
                // }
                // }
                // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
                // for (Long taskId : taskIds) {
                // Task task = taskService.getById(taskId);
                // report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
                // }

            }
            //从输送线取货完成
//            if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE)) {
//                WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
//                List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                for (Long taskId : taskIds) {
//                    Task task = taskService.getById(taskId);
//                    report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
//                }
//            }
            //往输送线放货完成
//            if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE)) {
//                WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
//                List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
//                for (Long taskId : taskIds) {
//                    Task task = taskService.getById(taskId);
//                    report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
//                }
//            }
            // 从输送线取货完成
            // if
            // (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE))
            // {
            // WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
            // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
            // for (Long taskId : taskIds) {
            // Task task = taskService.getById(taskId);
            // report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
            // }
            // }
            // 往输送线放货完成
            // if
            // (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE))
            // {
            // WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
            // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
            // for (Long taskId : taskIds) {
            // Task task = taskService.getById(taskId);
            // report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
            // }
            // }

            // 路径完成 || 充电完成
            if (agv_11_up.getCompleteType().equals(AgvCompleteType.ENTIRE_PATH_COMPLETE)
@@ -2260,10 +2286,9 @@

                // segment list
                List<Segment> segmentList = segmentService.list(new LambdaQueryWrapper<Segment>()
                                .eq(Segment::getGroupId, serialNo)
//                        .eq(Segment::getState, SegmentStateType.RUNNING.toString())
                                .orderByAsc(Segment::getSerial)
                );
                        .eq(Segment::getGroupId, serialNo)
                        // .eq(Segment::getState, SegmentStateType.RUNNING.toString())
                        .orderByAsc(Segment::getSerial));

                // settlement
                this.settleSegmentList(segmentList, serialNo);
@@ -2281,7 +2306,6 @@
        }
    }


    @Transactional
    public void settleSegmentList(List<Segment> segmentList, String serialNo) {
        if (Cools.isEmpty(segmentList)) {
@@ -2293,7 +2317,6 @@
        for (Segment segment : segmentList) {
            boolean taskComplete = false;
            boolean otbin = false;


            Task task = taskService.getById(segment.getTaskId());
            assert null != task;
@@ -2330,7 +2353,6 @@
                report(task, null, TaskReportStsType.OTBIN);
            }


            if (taskComplete) {
                locService.taskCallBackEnd(task);

@@ -2351,8 +2373,7 @@
        if (!Cools.isEmpty(serialNo)) {
            List<Action> actionList = actionService.list(new LambdaQueryWrapper<Action>()
                    .eq(Action::getGroupId, serialNo)
                    .eq(Action::getActionSts, ActionStsType.ISSUED.val())
            );
                    .eq(Action::getActionSts, ActionStsType.ISSUED.val()));
            for (Action action : actionList) {
                action.setActionSts(ActionStsType.FINISH.val());
                action.setEndTime(now);
@@ -2384,7 +2405,9 @@
        if (task.getBusId() == null) {
            return;
        }
        List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$()).eq(TaskReport::getTaskSts, taskReportStsType.status));
        List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>()
                .eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$())
                .eq(TaskReport::getTaskSts, taskReportStsType.status));
        if (!Cools.isEmpty(list)) {
            log.info("TaskReport [{},{}] 已重复，不再插入 ==========>> ", taskReportStsType, JSON.toJSONString(task));
            return;
@@ -2417,7 +2440,7 @@
            return false;
        }
        Integer time = configService.getVal("TIMEOUT", Integer.class, 5);
        //Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);
        // Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);
        Map<String, Object> data = new HashMap<>();
        data.put("askType", askType);
        data.put("askSta", askSta);