#容器到达后流程修改

skyouc

2025-01-02 43fb93554a1b530bd3ade363adc0a3aad7b1daf5

#容器到达后流程修改

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -149,13 +149,13 @@


    /**

     * 出库任务---通知容器流动

     * 每隔3秒，获取当前出库任务列表状态为WCS_EXECUTE_OUT_ARRIVED的任务，并通知ESS流动输送线

     * 每隔3秒，获取当前出库任务列表状态为COMPLETE_OUT的任务，并通知ESS流动输送线

     */

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

    @Transactional(rollbackFor = Exception.class)

    public void conveyorToNotify() {

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()

                .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id).eq(Task::getStatus, 1));

                .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_CONVEYOR.id).eq(Task::getStatus, 1));



        // 还需要再修改

        tasks.forEach(task -> {

@@ -187,7 +187,7 @@
                        //流动通知下发完成后，修改任务状态为输送线流动中。。

                        taskService.update(new LambdaUpdateWrapper<Task>()

                                .eq(Task::getId, task.getId())

                                .set(Task::getTaskSts, TaskStsType.COMPLETE_IN.id));

                                .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));



//                        log.info(task.getTaskNo() + "下发流动通知" + commonReponse.getMsg());

//                    } else {


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java

@@ -45,6 +45,11 @@
    @Autowired

    private DictService dictService;



    /**

     * modifty：

     * original : fetch datasource of task type on WAVE_SEED

     * now: Fetch datasource of task type  on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting  the task type equal to WAVE_SEED

     */

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

    @Transactional(rollbackFor = Exception.class)

    public void taskWave() {

@@ -58,8 +63,9 @@
            if (!autoCreateWaveSeed.equals("true")) {

                return;

            }



            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));

            //查询状态为容器到达状态所有任务单据

//            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));

            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id));

            if (taskList.isEmpty()) {

//                throw new CoolException("没有可播种任务！！");

            } else {

@@ -144,7 +150,7 @@


                    }



                    task.setTaskSts(TaskStsType.COMPLETE_OUT.id);

                    task.setTaskSts(TaskStsType.WAVE_SEED.id);

                    task.setUpdateTime(new Date());

                    if (!taskService.updateById(task)) {

                        throw new CoolException("任务更新失败");