#

luxiaotao1123

2024-12-23 766bcd63a19f7acaff2f5ed2cd1cb016894978ea

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

@@ -47,6 +47,8 @@
    @Autowired
    private MainService mainService;
    @Autowired
    private MainLockWrapService mainLockWrapService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CodeService codeService;
@@ -110,13 +112,13 @@
                if (null == endCode) {
                    return R.error();
                }
                if (!mainService.buildMinorTask(agv, agvDetail, param.getTaskMode(), endCode.getData())) {
                if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), endCode.getData(), null)) {
                    return R.error();
                }
                break;
            case TO_CHARGE:
            case TO_STANDBY:
                if (!mainService.buildMinorTask(agv, agvDetail, param.getTaskMode(), null)) {
                if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), null, null)) {
                    return R.error();
                }
                break;
@@ -159,7 +161,9 @@
                task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum()));

                task.setOriLoc(oriLoc.getId());
                task.setOriCode(oriLoc.getCode());
                task.setDestLoc(destLoc.getId());
                task.setDestCode(destLoc.getCode());

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