fix: 完善审批流程与业务状态校验

liu

2026-10-23 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java

@@ -216,7 +216,9 @@
        // 3. 校验审批配置已启用且配置了有效审批人（未配置时抛出带明确提示的业务异常）
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_PLAN_APPROVE_BIZ_TYPE);
        // 4. 状态置为审批中，并清空上一轮审核结果，避免残留「审核不通过」的原因
        purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus());
        if (purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(PURCHASE_PLAN_SUBMIT_FAIL_NOT_ALLOWED);
        }
    }

    @Override
@@ -241,13 +243,17 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(PURCHASE_PLAN_AUDIT_REJECT_REASON_REQUIRED);
            }
            purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为审核通过
        purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
        }
        // 6. 审核通过且未生成申请，自动生成采购申请
        if (!Boolean.TRUE.equals(plan.getGeneratedFlag())) {
            try {
@@ -566,7 +572,8 @@

    private ErpPurchasePlanDO validatePurchasePlanCanModify(Long id) {
        ErpPurchasePlanDO plan = validatePurchasePlanExists(id);
        if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())) {
        if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())
                && !ErpPurchasePlanStatusEnum.REJECT.getStatus().equals(plan.getStatus())) {
            throw exception(PURCHASE_PLAN_UPDATE_FAIL_NOT_DRAFT, plan.getNo());
        }
        return plan;