chen.lin
2 天以前 9140aee230de0ef41de9682a9353fbd372e2bcaa
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -248,15 +248,25 @@
    /**
     * 非光电站点任务下发
     */
    @Scheduled(cron = "0/55 * * * * ?  ")
    @Scheduled(cron = "0/35 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void pubTaskToWcs() {
        log.info("定时任务开始执行:任务下发到RCS");
        Long loginUserId = SystemAuthUtils.getLoginUserId();
        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPITY_IN.type
                , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_IN.type,
                TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
        List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Integer> list = Arrays.asList(
                 TaskType.TASK_TYPE_LOC_MOVE.type
                ,TaskType.TASK_TYPE_OUT.type
                ,TaskType.TASK_TYPE_EMPITY_OUT.type
                ,TaskType.TASK_TYPE_CHECK_OUT.type
                ,TaskType.TASK_TYPE_MERGE_OUT.type
                ,TaskType.TASK_TYPE_PICK_AGAIN_OUT.type
                ,TaskType.TASK_TYPE_IN.type
                ,TaskType.TASK_TYPE_EMPITY_IN.type
                ,TaskType.TASK_TYPE_CHECK_IN.type
                ,TaskType.TASK_TYPE_MERGE_IN.type
                ,TaskType.TASK_TYPE_PICK_IN.type
        );
        List<Integer> integers = Arrays.asList(/*TaskStsType.GENERATE_IN.id,*/ TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, list)
                .in(Task::getTaskStatus, integers)
@@ -362,7 +372,7 @@
    /**
     * 每五秒校验深库位是否为空,如果浅库位有货,将浅库位移至深库位
     *///TODO 生成移库任务前,需要检查是否有任务前往当前托盘
     *///TODO 生成移库任务前,需要检查是否有任务前往当前料箱
//    @Scheduled(cron = "0/35 * * * * ?  ")
//    @Transactional(rollbackFor = Exception.class)
//    public void shallocToDeep() throws Exception {
@@ -638,6 +648,9 @@
                                        if (!Boolean.parseBoolean(allowChang.getVal())) {
                                            if (order.getAnfme().compareTo(order.getQty()) == 0) {
                                                order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                                                if (order.getQty() == null || order.getQty().compareTo(0.0) == 0) {
                                                    order.setQty(order.getWorkQty() != null ? order.getWorkQty() : 0.0);
                                                }
                                                if (!asnOrderService.updateById(order)) {
                                                    logger.error("出库单更新状态失败。订单ID:{},订单编码:{}", order.getId(), order.getCode());
                                                }
@@ -645,6 +658,9 @@
                                        } else {
                                            if (order.getAnfme().compareTo(order.getQty()) <= 0) {
                                                order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                                                if (order.getQty() == null || order.getQty().compareTo(0.0) == 0) {
                                                    order.setQty(order.getWorkQty() != null ? order.getWorkQty() : 0.0);
                                                }
                                                if (!asnOrderService.updateById(order)) {
                                                    logger.error("出库单更新状态失败。订单ID:{},订单编码:{}", order.getId(), order.getCode());
                                                }