#

Junjie

2024-04-08 79603e53c78e535dba4bfbc69b8c3b5c184012c5

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java

@@ -61,13 +61,13 @@
                    continue;
                }

                // 更新wrkMast
                switch (TaskStsType.query(task.getTaskSts())) {
                // 更新Task
                switch (TaskStsType.queryById(task.getTaskSts())) {
                    case ANALYZE_INBOUND:
                        task.setTaskSts(TaskStsType.EXECUTE_INBOUND.sts);
                        task.setTaskSts(TaskStsType.EXECUTE_INBOUND.getId());
                        break;
                    case ANALYZE_OUTBOUND:
                        task.setTaskSts(TaskStsType.EXECUTE_OUTBOUND.sts);
                        task.setTaskSts(TaskStsType.EXECUTE_OUTBOUND.getId());
                        break;
                }
                task.setUpdateTime(now);
@@ -90,13 +90,13 @@
                        continue;
                    }

                    // 更新wrkMast
                    switch (TaskStsType.query(task.getTaskSts())) {
                    // 更新Task
                    switch (TaskStsType.queryById(task.getTaskSts())) {
                        case EXECUTE_INBOUND:
                            task.setTaskSts(TaskStsType.COMPLETE_INBOUND.sts);
                            task.setTaskSts(TaskStsType.COMPLETE_INBOUND.getId());
                            break;
                        case EXECUTE_OUTBOUND:
                            task.setTaskSts(TaskStsType.COMPLETE_OUTBOUND.sts);
                            task.setTaskSts(TaskStsType.COMPLETE_OUTBOUND.getId());
                            break;
                    }
                    task.setUpdateTime(now);
@@ -173,7 +173,59 @@

//    @Scheduled(cron = "0/1 * * * * ? ")
    public synchronized void executeManualTask() {
        Date now = new Date();
        // ANALYZE_MANUAL
        for (Task task : taskService.selectByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
            }

            Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());
            if (null != motion) {
                boolean result = this.executeMotion(motion);
                if (!result) {
                    continue;
                }
                // 更新Task
                switch (TaskStsType.queryById(task.getTaskSts())) {
                    case ANALYZE_MANUAL:
                        task.setTaskSts(TaskStsType.EXECUTE_MANUAL.getId());
                        break;
                }
                task.setUpdateTime(now);
                if (!taskService.updateById(task)) {
                    log.error("{}其他工作档更新状态失败！", task.getTaskNo());
                }
            }
        }
        // EXECUTE_MANUAL
        for (Task task : taskService.selectManualByExecuteSts()) {
            if (!motionService.hasRunningMotion(task.getUuid(), task.getHostId())) {
                Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.WAITING.val(), task.getHostId());
                if (null != motion) {
                    boolean result = this.executeMotion(motion);
                    if (!result) {
                        continue;
                    }
                } else {
                    if (motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId()) != null) {
                        continue;
                    }

                    // 更新Task
                    switch (TaskStsType.queryById(task.getTaskSts())) {
                        case EXECUTE_MANUAL:
                            task.setTaskSts(TaskStsType.COMPLETE_MANUAL.getId());
                            break;
                    }
                    task.setUpdateTime(now);
                    if (!taskService.updateById(task)) {
                        log.error("{}他工作档更新状态失败！", task.getTaskNo());
                    }
                }
            }
        }
    }

    @Scheduled(cron = "0/1 * * * * ? ")