入库回复库位

chen.lin

昨天 28eb4a986facf602abe0bf4b92ca430cf713395d

入库回复库位

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -47,6 +47,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -124,75 +125,79 @@
        // 验证设备站点
        DeviceSite deviceSite = validateDeviceSite(param);

        // 提前定义waitPakin，避免作用域问题
        // 提前定义 waitPakin / waitPakinItems，供后续其他入库逻辑使用
        WaitPakin waitPakin = null;
        List<WaitPakinItem> waitPakinItems = Collections.emptyList();

        // 先验证组拖状态，获取组托明细信息（用于批号匹配和单号检查）
        waitPakin = validateWaitPakin(param.getBarcode());
        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(
                new LambdaQueryWrapper<WaitPakinItem>()
                        .eq(WaitPakinItem::getPakinId, waitPakin.getId()));

        // 先检查是否有拣料入库任务（需要同时匹配箱号和批号）
        // 1. 先查询任务管理中的拣料入库任务、盘点入库任务（仅按箱号+类型+状态，不依赖组托）
        Task pickInTask = null;
        // 检查是否有盘点入库任务（需要同时匹配箱号和批号）
        Task checkInTask = null;

        if (!waitPakinItems.isEmpty()) {
            // 获取组托明细中的批号列表（去重）
            List<String> batchList = waitPakinItems.stream()
        // 可选：若有组托则取批号，用于多任务时优先按批号匹配
        WaitPakin waitPakinForBatch = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, param.getBarcode())
                .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
        List<String> batchList = Collections.emptyList();
        if (waitPakinForBatch != null) {
            List<WaitPakinItem> itemsForBatch = waitPakinItemService.list(
                    new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakinForBatch.getId()));
            batchList = itemsForBatch.stream()
                    .map(WaitPakinItem::getBatch)
                    .filter(Objects::nonNull)
                    .filter(batch -> !batch.trim().isEmpty())
                    .distinct()
                    .collect(Collectors.toList());

            if (!batchList.isEmpty()) {
                log.info("检查组托明细批号 - 批号列表：{}", batchList);
                log.info("检查组托明细批号（用于匹配拣料/盘点入库任务） - 批号列表：{}", batchList);
            }
        }

                // 查询拣料入库任务：箱号匹配且状态为1、2或199（RCS申请入库时，状态199需要变成2）
                List<Task> pickInTasks = taskService.list(new LambdaQueryWrapper<Task>()
                        .eq(Task::getBarcode, param.getBarcode())
                        .eq(Task::getTaskType, TaskType.TASK_TYPE_PICK_IN.type)
                        .in(Task::getTaskStatus, TaskStsType.GENERATE_IN.id, TaskStsType.WAVE_SEED.id)
                        .orderByDesc(Task::getCreateTime));
        // 查询任务管理：拣料入库任务（箱号+类型53+状态1/2/199）
        List<Task> pickInTasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getBarcode, param.getBarcode())
                .eq(Task::getTaskType, TaskType.TASK_TYPE_PICK_IN.type)
                .in(Task::getTaskStatus, TaskStsType.GENERATE_IN.id, TaskStsType.WCS_EXECUTE_IN.id, TaskStsType.WAVE_SEED.id)
                .orderByDesc(Task::getCreateTime));
        for (Task task : pickInTasks) {
            if (batchList.isEmpty()) {
                pickInTask = task;
                log.info("找到匹配的拣料入库任务（按箱号） - 任务编码：{}，箱号：{}", task.getTaskCode(), param.getBarcode());
                break;
            }
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
                    .eq(TaskItem::getTaskId, task.getId())
                    .in(TaskItem::getBatch, batchList));
            if (!taskItems.isEmpty()) {
                pickInTask = task;
                log.info("找到匹配的拣料入库任务（箱号和批号都匹配） - 任务编码：{}，批号：{}", task.getTaskCode(), batchList);
                break;
            }
        }

                // 通过TaskItem的batch字段匹配批号
                for (Task task : pickInTasks) {
                    List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
                            .eq(TaskItem::getTaskId, task.getId())
                            .in(TaskItem::getBatch, batchList));

                    if (!taskItems.isEmpty()) {
                        pickInTask = task;
                        log.info("找到匹配的拣料入库任务（箱号和批号都匹配） - 任务编码：{}，批号：{}",
                                task.getTaskCode(), batchList);
                        break;
                    }
        // 查询任务管理：盘点入库任务（箱号+类型+状态1/2/199）
        if (pickInTask == null) {
            List<Task> checkInTasks = taskService.list(new LambdaQueryWrapper<Task>()
                    .eq(Task::getBarcode, param.getBarcode())
                    .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_IN.type)
                    .in(Task::getTaskStatus, TaskStsType.GENERATE_IN.id, TaskStsType.WCS_EXECUTE_IN.id, TaskStsType.WAVE_SEED.id)
                    .orderByDesc(Task::getCreateTime));
            for (Task task : checkInTasks) {
                if (batchList.isEmpty()) {
                    checkInTask = task;
                    log.info("找到匹配的盘点入库任务（按箱号） - 任务编码：{}，箱号：{}", task.getTaskCode(), param.getBarcode());
                    break;
                }

                // 查询盘点入库任务：箱号匹配且状态为1、2或199（RCS申请入库时，状态199需要变成2）
                List<Task> checkInTasks = taskService.list(new LambdaQueryWrapper<Task>()
                        .eq(Task::getBarcode, param.getBarcode())
                        .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_IN.type)
                        .in(Task::getTaskStatus, TaskStsType.GENERATE_IN.id, TaskStsType.WCS_EXECUTE_IN.id, TaskStsType.WAVE_SEED.id)
                        .orderByDesc(Task::getCreateTime));

                // 通过TaskItem的batch字段匹配批号
                for (Task task : checkInTasks) {
                    List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
                            .eq(TaskItem::getTaskId, task.getId())
                            .in(TaskItem::getBatch, batchList));

                    if (!taskItems.isEmpty()) {
                        checkInTask = task;
                        log.info("找到匹配的盘点入库任务（箱号和批号都匹配） - 任务编码：{}，批号：{}",
                                task.getTaskCode(), batchList);
                        break;
                    }
                List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
                        .eq(TaskItem::getTaskId, task.getId())
                        .in(TaskItem::getBatch, batchList));
                if (!taskItems.isEmpty()) {
                    checkInTask = task;
                    log.info("找到匹配的盘点入库任务（箱号和批号都匹配） - 任务编码：{}，批号：{}", task.getTaskCode(), batchList);
                    break;
                }
            }
        }



        // 如果是拣料入库任务，直接返回，不校验组托
        if (Objects.nonNull(pickInTask)) {
@@ -300,6 +305,12 @@
            return msgDto;
        }

        // 2. 若未命中拣料/盘点入库，再校验组托并继续其他入库逻辑
        if (pickInTask == null && checkInTask == null) {
            waitPakin = validateWaitPakin(param.getBarcode());
            waitPakinItems = waitPakinItemService.list(
                    new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
        }
        // 检查其他入库任务类型（用箱号查询，状态为1或2）
        // 注意：盘点入库已单独处理，不再包含在此列表中
        List<Integer> otherInboundTaskTypes = Arrays.asList(
@@ -408,7 +419,7 @@
    private WaitPakin validateWaitPakin(String barcode) {
        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, barcode)
                .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
                    .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));

        if (Cools.isEmpty(waitPakin)) {
            throw new CoolException("请检查组拖状态是否完成！！");