#

vincentlu

9 天以前 efabc6ba991acfd01d38bb0bf4e8cfd772416617

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java

@@ -73,6 +73,8 @@
    private AvoidWaveCalculator avoidWaveCalculator;
    @Autowired
    private PatrolService patrolService;
    @Autowired
    private StaReserveService staReserveService;

    @PreAuthorize("hasAuthority('manager:agv:update')")
    @OperationLog("Locate All Agv")
@@ -149,12 +151,28 @@
                    .eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                            .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                })) > 0) {
            log.info(agv.getUuid() + "号AGV不可用，已经存在进行中的任务...");
            log.info("{}号AGV不可用，已经存在进行中的任务...", agv.getUuid());
            return R.error();
        }
        if (!agvService.judgeEnable(agv.getId())) {
            log.info(agv.getUuid() + "号AGV不可用，任务无法计算...");
            log.info("{}号AGV不可用，任务无法计算...", agv.getUuid());
            return R.error();
        }

        Task task = new Task();
        task.setAgvId(agv.getId());
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        List<Task> lastTasks = taskService.list(new LambdaQueryWrapper<Task>().orderByDesc(Task::getId));
        task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum()));

        task.setTaskType(param.getTaskMode().val());
        task.setTaskSts(TaskStsType.WAITING.val());

        task.setPriority(999);
        task.setIoTime(now);
        task.setStartTime(now);
        if (!taskService.save(task)) {
            throw new BusinessException(task.getSeqNum() + "任务保存失败");
        }

        // generate
@@ -162,7 +180,6 @@
        Loc destLoc = null;
        Sta oriSta = null;
        Sta destSta = null;
        Task task = null;
        switch (param.getTaskMode()) {
            case MOVE:
                Code endCode = null;
@@ -225,8 +242,6 @@
                }

                // task
                task = new Task();

                task.setOriLoc(oriLoc.getId());
                task.setOriCode(oriLoc.getCode());
                task.setDestLoc(destLoc.getId());
@@ -262,18 +277,11 @@
                if (null == destSta) {
                    return R.error();
                }
                if (!destSta.getStaSts().equals(StaStsType.IDLE.val())) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 不是无货状态");
                }
                destSta.setStaSts(StaStsType.READY_RELEASE.val());
                destSta.setUpdateTime(now);
                if (!staService.updateById(destSta)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 修改站点状态失败");
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }

                // task
                task = new Task();

                task.setOriLoc(oriLoc.getId());
                task.setOriCode(oriLoc.getCode());
                task.setDestSta(destSta.getId());
@@ -290,13 +298,8 @@
                if (null == oriSta) {
                    return R.error();
                }
                if (!oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 不是有货状态");
                }
                oriSta.setStaSts(StaStsType.READY_TAKE.val());
                oriSta.setUpdateTime(now);
                if (!staService.updateById(oriSta)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 修改站点状态失败");
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }

                // destLoc
@@ -319,8 +322,6 @@
                }

                // task
                task = new Task();

                task.setOriSta(oriSta.getId());
                task.setOriCode(oriSta.getCode());
                task.setDestLoc(destLoc.getId());
@@ -337,13 +338,8 @@
                if (null == oriSta) {
                    return R.error();
                }
                if (!oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 不是有货状态");
                }
                oriSta.setStaSts(StaStsType.READY_TAKE.val());
                oriSta.setUpdateTime(now);
                if (!staService.updateById(oriSta)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 修改站点状态失败");
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }

                // destSta
@@ -356,18 +352,11 @@
                if (null == destSta) {
                    return R.error();
                }
                if (!destSta.getStaSts().equals(StaStsType.IDLE.val())) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 不是无货状态");
                }
                destSta.setStaSts(StaStsType.READY_RELEASE.val());
                destSta.setUpdateTime(now);
                if (!staService.updateById(destSta)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 修改站点状态失败");
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }

                // task
                task = new Task();

                task.setOriSta(oriSta.getId());
                task.setOriCode(oriSta.getCode());
                task.setDestSta(destSta.getId());
@@ -377,23 +366,9 @@
                break;
        }

        if (null != task) {
            task.setAgvId(agv.getId());
            task.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            List<Task> lastTasks = taskService.list(new LambdaQueryWrapper<Task>().orderByDesc(Task::getId));
            task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum()));

            task.setTaskType(param.getTaskMode().val());
            task.setTaskSts(TaskStsType.WAITING.val());

            task.setPriority(999);
            task.setIoTime(now);
            task.setStartTime(now);
            if (!taskService.save(task)) {
                throw new BusinessException(task.getSeqNum() + "任务保存失败");
            }
        if (!taskService.updateById(task)) {
            throw new BusinessException("任务更新失败");
        }

        return R.ok();
    }