zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -14,6 +14,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -148,14 +150,15 @@
    /**
     * //fixme 弃用
     * 出库任务---通知容器流动
     * 每隔3秒,获取当前出库任务列表状态为WCS_EXECUTE_OUT_ARRIVED的任务,并通知ESS流动输送线
     * 每隔3秒,获取当前出库任务列表状态为COMPLETE_OUT的任务,并通知ESS流动输送线
     */
    @Scheduled(cron = "0/5 * * * * ? ")
//    @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 -> {
@@ -185,9 +188,9 @@
//                    CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);
//                    if (commonReponse.getCode() == 0) {
                        //流动通知下发完成后,修改任务状态为输送线流动中。。
                        taskService.update(new LambdaUpdateWrapper<Task>()
                                .eq(Task::getId, task.getId())
                                .set(Task::getTaskSts, TaskStsType.COMPLETE_IN.id));
//                        taskService.update(new LambdaUpdateWrapper<Task>()
//                                .eq(Task::getId, task.getId())
//                                .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
//                        log.info(task.getTaskNo() + "下发流动通知" + commonReponse.getMsg());
//                    } else {
@@ -218,8 +221,11 @@
        //获取当前任务档中,所有为待出库状态的任务档,按时间升序排列
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                        .ge(Task::getTaskType, 101) //TODO 如何确认是101,还是103
                        .eq(Task::getTaskSts, TaskStsType.GENERATE_OUT.id))
                .stream().sorted(Comparator.comparing(Task::getTaskSts))
                        .eq(Task::getTaskSts, TaskStsType.GENERATE_OUT.id));
        if (tasks.isEmpty()) {
            return;
        }
        tasks.stream().sorted(Comparator.comparing(Task::getTaskSts))
                .collect(Collectors.toList());
        // 数据组装