RCS对接优化

chen.lin

15 小时以前 a2ef34a807b1f88ac9b18dae51adbf61ce821595

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -8,7 +8,6 @@
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.DateUtils;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
@@ -105,10 +104,11 @@


    /**
     * @param
     * @return
     * 完成入库，更新库位明细、组托状态，并在此统一执行 9.1 入/出库结果上报云仓。
     * 与 RCS 回调形成闭环：RCS 上报任务结束后仅将任务状态置为 COMPLETE_IN（见 WcsServiceImpl.receiveExMsg），
     * 本定时任务扫描 COMPLETE_IN 并执行 complateInTask（库位、组托、9.1 上报云仓）。
     *
     * @author Ryan
     * @description 完成入库，更新库存
     * @time 2025/4/2 12:37
     */
    @Scheduled(cron = "0/3 * * * * ?")
@@ -123,10 +123,12 @@
    }

    /**
     * 完成出库任务，更新库位/出库单，并在此统一执行 9.1 入/出库结果上报云仓。
     * 与 RCS 回调形成闭环：RCS 上报 END 后仅将出库任务状态置为 COMPLETE_OUT（见 WcsServiceImpl.receiveExMsg），
     * 本定时任务扫描 COMPLETE_OUT 并执行 completeTask（扣库位、更新出库单、9.1 上报云仓）。
     *
     * @author Ryan
     * @date 2025/5/20
     * @description: 完成出库任务，更新库存
     * @version 1.0
     */
    @Scheduled(cron = "0/5 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
@@ -249,25 +251,39 @@
    /**
     * 非光电站点任务下发
     */
    @Scheduled(cron = "0/55 * * * * ?  ")
    @Scheduled(cron = "0/35 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void pubTaskToWcs() {
        log.debug("定时任务开始执行：任务下发到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)
                .orderByDesc(Task::getSort));
        log.debug("查询到待下发任务数量：{}", tasks.size());
        if (tasks.isEmpty()) {
            log.debug("没有待下发的任务，定时任务结束");
            return;
        }
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
        if (!Objects.isNull(config) && !Objects.isNull(config.getVal())) {
            if (Boolean.parseBoolean(config.getVal())) {
               return;
                log.info("配置项AUTO_RUN_CHECK_ORDERS为true，跳过任务下发");
                return;
            }
        }
//        for (Task task : tasks) {
@@ -282,7 +298,9 @@
//            }
//        }
        /**下发普通站点任务，报错回滚，不再往下执行*/
        log.debug("开始下发{}个任务到RCS", tasks.size());
        taskService.pubTaskToWcs(tasks);
        log.debug("定时任务执行完成：任务下发到RCS");
    }

    /**
@@ -357,7 +375,7 @@

    /**
     * 每五秒校验深库位是否为空，如果浅库位有货，将浅库位移至深库位
     *///TODO 生成移库任务前，需要检查是否有任务前往当前托盘
     *///TODO 生成移库任务前，需要检查是否有任务前往当前料箱
//    @Scheduled(cron = "0/35 * * * * ?  ")
//    @Transactional(rollbackFor = Exception.class)
//    public void shallocToDeep() throws Exception {
@@ -564,6 +582,8 @@
        } else {
            queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
        }
        queryWrapper.last("ORDER BY RAND() LIMIT 1");

        List<Task> tasks = taskService.list(queryWrapper);
        if (tasks.isEmpty()) {
            return;
@@ -578,69 +598,92 @@
            }
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));

            // 上报ERP暂时注释（/rsf-open-api/erp/report/order）
            // if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
            //     for (TaskItem taskItem : taskItems) {
            //         if (Objects.isNull(taskItem.getOrderId())) {
            //             continue;
            //         }
            //         WkOrder order = asnOrderService.getById(taskItem.getOrderId());
            //         if (Objects.isNull(order)) {
            //             continue;
            //         }
            //         // 入库单任务明细上报：优先按 orderItemId（单据明细ID）查，否则按 orderId+matnrId(+fieldsIndex) 查，确保能找到单据明细
            //         WkOrderItem wkOrderItem = null;
            //         if (taskItem.getOrderItemId() != null) {
            //             wkOrderItem = asnOrderItemService.getById(taskItem.getOrderItemId());
            //         }
            //         if (wkOrderItem == null) {
            //             LambdaQueryWrapper<WkOrderItem> qw = new LambdaQueryWrapper<WkOrderItem>()
            //                     .eq(WkOrderItem::getOrderId, order.getId())
            //                     .eq(WkOrderItem::getMatnrId, taskItem.getMatnrId());
            //             if (StringUtils.isNotBlank(taskItem.getFieldsIndex())) {
            //                 qw.eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex());
            //             }
            //             wkOrderItem = asnOrderItemService.getOne(qw);
            //         }
            //         if (Objects.isNull(wkOrderItem)) {
            //             logger.warn("任务历史档处理：单据明细不存在或已完成，跳过上报 - taskId={}, orderId={}, orderItemId={}, matnrId={}, fieldsIndex={}", task.getId(), order.getId(), taskItem.getOrderItemId(), taskItem.getMatnrId(), taskItem.getFieldsIndex());
            //             continue;
            //         }
            //         /**入库单明细上报*/
            //         reportMsgService.reportOrderItem(wkOrderItem);
            //     }
            // } else
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                for (TaskItem taskItem : taskItems) {
                    if (Objects.isNull(taskItem.getOrderId())) {
                        continue;
                    }
                    WkOrder order = asnOrderService.getById(taskItem.getOrderId());
                    if (Objects.isNull(order)) {
                        continue;
                    }
                    //入库单任务明细上报
                    WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                            .eq(WkOrderItem::getOrderId, order.getId())
                            .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
                    if (Objects.isNull(wkOrderItem)) {
                        throw new CoolException("数据错误，单据明细不存在或已完成！！");
                    }
                    /**入库单明细上报*/
                    reportMsgService.reportOrderItem(wkOrderItem);
                }
                // 入库类型仅转历史，不上报ERP（已注释）
            } else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
                /**判断单据是否完成**/
                Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
                List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
                        .in(WaveOrderRela::getWaveId, longSet));
                if (Cools.isEmpty(waveOrderRelas)) {
                    throw new CoolException("波次对应关联单未找到");
                }
                Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
                List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
                if (wkOrders.isEmpty()) {
                    throw new CoolException("单据不存在！！");
                }

                Config allowChang = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));

                wkOrders.forEach(order -> {
                    //判断是否允许超收，不允许超收添加拒收判断
                    if (!Objects.isNull(allowChang)) {
                        if (!Boolean.parseBoolean(allowChang.getVal())) {
                            if (order.getAnfme().compareTo(order.getQty()) == 0) {
                                order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                                if (!asnOrderService.updateById(order)) {
                                    throw new CoolException("出库单更新状态失败");
                                }
                            }
                        } else {
                            if (order.getAnfme().compareTo(order.getQty()) <= 0) {
                                order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                                if (!asnOrderService.updateById(order)) {
                                    throw new CoolException("出库单更新状态失败");
                                }
                            }
                /**判断单据是否完成：波次下发、按单下发（点击下发任务）完成后均将出库单置为完结*/
                Set<Long> orderIdsToDone = new HashSet<>();
                if (task.getResource() != null && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)) {
                    Set<Long> longSet = taskItems.stream()
                            .map(TaskItem::getSourceId)
                            .filter(Objects::nonNull)
                            .collect(Collectors.toSet());
                    if (!longSet.isEmpty()) {
                        List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
                                .in(WaveOrderRela::getWaveId, longSet));
                        if (!Cools.isEmpty(waveOrderRelas)) {
                            orderIdsToDone.addAll(waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet()));
                        }
                    }
                    //检查单据是否完成

                });
                } else if (task.getResource() != null && task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) {
                    // 按单下发：任务明细 sourceId 为出库单ID
                    Set<Long> ids = taskItems.stream()
                            .map(TaskItem::getSourceId)
                            .filter(Objects::nonNull)
                            .collect(Collectors.toSet());
                    orderIdsToDone.addAll(ids);
                }
                if (!orderIdsToDone.isEmpty()) {
                    List<WkOrder> wkOrders = asnOrderService.listByIds(orderIdsToDone);
                    if (!wkOrders.isEmpty()) {
                        Config allowChang = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
                        wkOrders.forEach(order -> {
                            if (order.getAnfme() == null) return;
                            boolean canDone = Boolean.TRUE.equals(allowChang != null && Boolean.parseBoolean(allowChang.getVal()))
                                    ? (order.getQty() != null && order.getAnfme().compareTo(order.getQty()) <= 0)
                                    : (order.getQty() != null && order.getAnfme().compareTo(order.getQty()) == 0);
                            if (canDone) {
                                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());
                                }
                            }
                        });
                    }
                }
                
                //出库单上报RCS修改库位状态
                try {
                    reportStationStatus(task);
                } catch (Exception e) {
                    throw new CoolException(e.getMessage());
                    logger.error("任务{}上报RCS修改库位状态失败。任务编码：{}", task.getId(), task.getTaskCode(), e);
                    // 不抛出异常，避免中断定时任务
                }
            }