liu
2026-10-24 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -181,9 +181,6 @@
        // 校验物料批次管理:如果物料开启批次管理,则明细的批次号不能为空
        validateBatchManagement(lines);
        // 校验审批配置已启用且配置了有效审核人(未配置时抛出带明确提示的业务异常)
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(ITEM_RECEIPT_APPROVE_BIZ_TYPE);
        // 提交(草稿 → 待上架),并清空上一轮审核结果
        itemReceiptMapper.submitAndResetAuditInfo(id, MesWmItemReceiptStatusEnum.APPROVING.getStatus());
    }
@@ -265,9 +262,9 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void stockItemReceipt(Long id) {
        // 校验存在 + 已审批(状态只能由 audit 推进:APPROVING → APPROVED)
        // 校验存在 + 待上架
        MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
        if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
        if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
            throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
        }
        // 校验每行明细数量之和是否等于行入库数量
@@ -283,8 +280,9 @@
                throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
            }
        }
        // 注意:本方法仅做数量一致性校验,不得修改单据状态。
        // 状态流转由 audit(APPROVING → APPROVED)与 finish(APPROVED → FINISHED)负责。
        // 上架完成(待上架 → 待执行入库)
        itemReceiptMapper.updateById(new MesWmItemReceiptDO()
                .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
    }
    @Override
@@ -406,7 +404,18 @@
    @Override
    public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
        // 仅草稿状态允许编辑行/明细;审批中(APPROVING)已锁定,避免绕过审核修改数据
        // 草稿与待上架状态允许编辑上架明细:提交后仓库执行上架时录入库位/批次
        MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
        if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.PREPARE.getStatus(), receipt.getStatus())
                && ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
            throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
        }
        return receipt;
    }
    @Override
    public MesWmItemReceiptDO validateItemReceiptLineEditable(Long id) {
        // 行数据仅草稿可改:提交后行数据锁定,避免上架阶段改动入库数量
        return validateItemReceiptExistsAndDraft(id);
    }