feat(mes): 实现库存移库功能

云

21 小时以前 eccad5a129106377a275be4f7cdc58e99e9b95d4

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java

@@ -9,17 +9,21 @@
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -29,6 +33,8 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.transaction.MesWmTransactionMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -61,7 +67,11 @@
    @Resource
    private MesProWorkOrderService workOrderService;
    @Resource
    private MesMdItemService itemService;
    private MesProTaskService taskService;
    @Resource
    private MesProTaskIssueMapper taskIssueMapper;
    @Resource
    private MesMdmItemService mdmItemService;
    @Resource
    private MesWmTransactionService wmTransactionService;
    @Resource
@@ -70,6 +80,8 @@
    private MesWmWarehouseLocationService locationService;
    @Resource
    private MesWmWarehouseAreaService areaService;
    @Resource
    private MesWmTransactionMapper transactionMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -77,7 +89,18 @@
        // 1. 校验关联数据
        validateReturnIssueSaveData(createReqVO);

        // 2. 插入主表
        // 2. 从 task 自动带入 workOrderId 和 workstationId（taskId 非必填）
        if (createReqVO.getTaskId() != null) {
            MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
            if (createReqVO.getWorkOrderId() == null) {
                createReqVO.setWorkOrderId(task.getWorkOrderId());
            }
            if (createReqVO.getWorkstationId() == null) {
                createReqVO.setWorkstationId(task.getWorkstationId());
            }
        }

        // 3. 插入主表
        MesWmReturnIssueDO issue = BeanUtils.toBean(createReqVO, MesWmReturnIssueDO.class);
        issue.setStatus(MesWmReturnIssueStatusEnum.PREPARE.getStatus());
        issueMapper.insert(issue);
@@ -92,11 +115,22 @@
        // 1.2 校验关联数据
        validateReturnIssueSaveData(updateReqVO);

        // 2. 更新主表
        // 2. 从 task 自动带入 workOrderId 和 workstationId（taskId 非必填）
        if (updateReqVO.getTaskId() != null) {
            MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
            if (updateReqVO.getWorkOrderId() == null) {
                updateReqVO.setWorkOrderId(task.getWorkOrderId());
            }
            if (updateReqVO.getWorkstationId() == null) {
                updateReqVO.setWorkstationId(task.getWorkstationId());
            }
        }

        // 3. 更新主表
        MesWmReturnIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDO.class);
        issueMapper.updateById(updateObj);

        // 3. 退料类型变更时，刷新所有行的质量状态
        // 4. 退料类型变更时，刷新所有行的质量状态
        if (ObjUtil.notEqual(oldIssue.getType(), updateReqVO.getType())) {
            issueLineService.updateReturnIssueQualityStatusByIssueId(updateReqVO.getId(), updateReqVO.getType());
        }
@@ -168,7 +202,7 @@
                        MesWmReturnIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                // 对比行数量与明细总数量，不满足直接抛出
                if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
                    MesMdItemDO item = itemService.validateItemExistsAndEnable(line.getItemId());
                    MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
                    throw exception(WM_RETURN_ISSUE_DETAIL_QUANTITY_MISMATCH,
                            item.getCode() + " " + item.getName() + " 未完成上架");
                }
@@ -192,7 +226,10 @@
        // 2. 遍历所有明细，创建库存事务（增加库存 + 记录流水）
        createTransactionList(issue);

        // 3. 更新退料单状态
        // 3. 扣减任务投料记录的可用量
        updateTaskIssueOnReturn(issue);

        // 4. 更新退料单状态
        issueMapper.updateById(new MesWmReturnIssueDO()
                .setId(id).setStatus(MesWmReturnIssueStatusEnum.FINISHED.getStatus()));
    }
@@ -203,7 +240,7 @@
        MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
        MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);

        // 2. 遍历明细，每条明细产生 OUT（虚拟线边库扣减）+ IN（实际仓库增加）
        // 2. 遍历明细，每条明细产生 OUT（虚拟线边库扣减）+ IN（上架目标仓库增加）
        List<MesWmReturnIssueDetailDO> details = issueDetailService.getReturnIssueDetailListByIssueId(issue.getId());
        for (MesWmReturnIssueDetailDO detail : details) {
            // 2.1 先从虚拟线边库出库（库存减少）
@@ -212,18 +249,64 @@
                    .setQuantity(detail.getQuantity().negate()) // 库存减少
                    .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
                    .setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
                    .setMaterialStockId(detail.getMaterialStockId()) // 指定虚拟线边库库存记录
                    .setCheckFlag(false) // 线边库允许负库存
                    .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
                    .setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
            // 2.2 再入实际仓库（库存增加）

            // 2.2 确定上架目标仓库：detail 的 warehouseId/locationId/areaId 是上架目标（实际仓库）
            //     如果前端仍传了虚拟线边库（兼容旧数据），则通过事务流水反查原始仓库
            Long targetWarehouseId = detail.getWarehouseId();
            Long targetLocationId = detail.getLocationId();
            Long targetAreaId = detail.getAreaId();
            if (virtualWarehouse.getId().equals(targetWarehouseId) && detail.getMaterialStockId() != null) {
                MesWmTransactionDO originalOutTx = transactionMapper.selectOriginalOutTransaction(detail.getMaterialStockId());
                if (originalOutTx != null) {
                    targetWarehouseId = originalOutTx.getWarehouseId();
                    targetLocationId = originalOutTx.getLocationId();
                    targetAreaId = originalOutTx.getAreaId();
                }
            }

            // 2.3 入上架目标仓库（库存增加）
            wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
                    .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
                    .setQuantity(detail.getQuantity()) // 库存增加（退料回仓）
                    .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
                    .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
                    .setWarehouseId(targetWarehouseId).setLocationId(targetLocationId).setAreaId(targetAreaId)
                    .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
                    .setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
                    .setRelatedTransactionId(outTransactionId)); // 关联出库事务
        }
    }

    /**
     * 退料完成时，扣减任务投料记录的可用量
     * 按行遍历，找到对应的 task_issue 记录，扣减 availableQuantity、issuedQuantity
     */
    private void updateTaskIssueOnReturn(MesWmReturnIssueDO issue) {
        List<MesWmReturnIssueLineDO> lines = issueLineService.getReturnIssueLineListByIssueId(issue.getId());
        if (CollUtil.isEmpty(lines)) {
            return;
        }
        for (MesWmReturnIssueLineDO line : lines) {
            Long taskId = line.getTaskId() != null ? line.getTaskId() : issue.getTaskId();
            if (taskId == null) {
                continue;
            }
            // 查找该 task + item + 来源为领料出库单 的投料记录
            List<MesProTaskIssueDO> taskIssues = taskIssueMapper.selectListByTaskId(taskId);
            MesProTaskIssueDO matchedIssue = CollUtil.findOne(taskIssues,
                    ti -> ti.getItemId().equals(line.getItemId())
                            && "PRODUCT_ISSUE".equals(ti.getSourceDocType()));
            if (matchedIssue != null) {
                // 扣减投料量和可用量
                BigDecimal newIssuedQty = matchedIssue.getIssuedQuantity().subtract(line.getQuantity());
                BigDecimal newAvailableQty = matchedIssue.getAvailableQuantity().subtract(line.getQuantity());
                matchedIssue.setIssuedQuantity(newIssuedQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newIssuedQty);
                matchedIssue.setAvailableQuantity(newAvailableQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newAvailableQty);
                taskIssueMapper.updateById(matchedIssue);
            }
        }
    }

@@ -289,7 +372,18 @@
     */
    private void validateReturnIssueSaveData(MesWmReturnIssueSaveReqVO reqVO) {
        validateCodeUnique(reqVO.getId(), reqVO.getCode());
        workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
        // 校验 task 存在（taskId 非必填，传了才校验）
        if (reqVO.getTaskId() != null) {
            MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
            // 校验 task 关联的工单已确认
            Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
            if (workOrderId != null) {
                workOrderService.validateWorkOrderConfirmed(workOrderId);
            }
        } else if (reqVO.getWorkOrderId() != null) {
            // 没传 taskId 但传了 workOrderId，校验工单已确认
            workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
        }
        if (reqVO.getWorkstationId() != null) {
            workstationService.validateWorkstationExistsAndEnable(reqVO.getWorkstationId());
        }