#

Junjie

2024-04-08 2f93fd44f708cd93fdb912600b0f4b664d11c95b

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

@@ -62,12 +62,12 @@
                }

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

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

//    @Scheduled(cron = "0/1 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    public synchronized void executeManualTask() {
        Date now = new Date();
        // ANALYZE_MANUAL
        for (Task task : taskService.selectByAnalyzeSts()) {
        for (Task task : taskService.selectManualByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
@@ -188,9 +188,9 @@
                    continue;
                }
                // 更新Task
                switch (TaskStsType.queryById(task.getTaskSts())) {
                switch (TaskStsType.query(task.getTaskSts())) {
                    case ANALYZE_MANUAL:
                        task.setTaskSts(TaskStsType.EXECUTE_MANUAL.getId());
                        task.setTaskSts(TaskStsType.EXECUTE_MANUAL.sts);
                        break;
                }
                task.setUpdateTime(now);
@@ -214,9 +214,9 @@
                    }

                    // 更新Task
                    switch (TaskStsType.queryById(task.getTaskSts())) {
                    switch (TaskStsType.query(task.getTaskSts())) {
                        case EXECUTE_MANUAL:
                            task.setTaskSts(TaskStsType.COMPLETE_MANUAL.getId());
                            task.setTaskSts(TaskStsType.COMPLETE_MANUAL.sts);
                            break;
                    }
                    task.setUpdateTime(now);