feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公

liu

2026-10-23 5421b8af862890dcf187c2ad5ece55423959ba85

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

@@ -6,6 +6,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
@@ -60,6 +63,11 @@
     */
    private static final String PURCHASE_REQUEST_APPROVE_BIZ_TYPE = "purchase_request_approve";

    /**
     * 采购申请审批的 BPM 流程定义 Key
     */
    private static final String PURCHASE_REQUEST_PROCESS_KEY = "purchase_request_approve";

    @Resource
    private ErpPurchaseRequestMapper purchaseRequestMapper;
    @Resource
@@ -86,6 +94,9 @@

    @Resource
    private ApprovalConfigApi approvalConfigApi;

    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;

    @Resource
    private AdminUserApi adminUserApi;
@@ -272,6 +283,11 @@
        if (purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
        }
        // 5. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(PURCHASE_REQUEST_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
@@ -335,6 +351,53 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updatePurchaseRequestAuditStatus(Long id, Integer bpmStatus, String reason) {
        // 1. BPM 审批结果映射为采购申请状态：通过=20 / 不通过=30 / 取消=40
        Integer newStatus = convertBpmResultToStatus(bpmStatus);
        if (newStatus == null) {
            return;
        }
        // 2. 仅当仍处于「审批中」时回写，避免重复覆盖
        if (purchaseRequestMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
            log.warn("[updatePurchaseRequestAuditStatus] 采购申请({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
            return;
        }
        // 3. 审批通过且有供应商、未生成订单时，自动生成采购订单
        if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)) {
            return;
        }
        ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
        if (purchaseRequest == null || purchaseRequest.getSupplierId() == null
                || purchaseRequest.getOrderId() != null) {
            return;
        }
        try {
            Long orderId = doGeneratePurchaseOrder(purchaseRequest);
            log.info("[updatePurchaseRequestAuditStatus] 采购申请({}) 自动生成采购订单({})", id, orderId);
        } catch (Exception e) {
            // 不抛出异常，避免影响审批结果落库；生成失败可由用户手动触发
            log.error("[updatePurchaseRequestAuditStatus] 采购申请({}) 自动生成采购订单失败", id, e);
        }
    }

    /**
     * 转换 BPM 审批结果为采购申请状态
     */
    private Integer convertBpmResultToStatus(Integer bpmStatus) {
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            return ErpPurchaseRequestStatusEnum.APPROVE.getStatus();
        }
        if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            return ErpPurchaseRequestStatusEnum.REJECT.getStatus();
        }
        if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
            return ErpPurchaseRequestStatusEnum.CANCEL.getStatus();
        }
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long generatePurchaseOrder(Long id, Long supplierId) {
        // 1. 校验存在 + 审核通过状态
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);