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

liu

2026-10-23 5421b8af862890dcf187c2ad5ece55423959ba85

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptServiceImpl.java

@@ -5,6 +5,9 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptPageReqVO;
@@ -60,8 +63,16 @@
     */
    private static final String EQUIPMENT_RECEIPT_APPROVE_BIZ_TYPE = "equipment_receipt_approve";

    /**
     * 设备入库单审批的 BPM 流程定义 Key
     */
    private static final String EQUIPMENT_RECEIPT_APPROVE_PROCESS_KEY = "equipment_receipt_approve";

    @Resource
    private MesWmEquipmentReceiptMapper equipmentReceiptMapper;

    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    @Lazy
    private MesWmEquipmentReceiptLineService equipmentReceiptLineService;
@@ -136,6 +147,30 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(EQUIPMENT_RECEIPT_APPROVE_BIZ_TYPE);
        // 4. 状态置为审批中，并清空上一轮审核结果
        equipmentReceiptMapper.submitAndResetAuditInfo(id, MesWmEquipmentReceiptStatusEnum.APPROVING.getStatus());
        // 5. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(EQUIPMENT_RECEIPT_APPROVE_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEquipmentReceiptAuditStatus(Long id, Integer bpmStatus, String reason) {
        // BPM 审批结果映射为单据状态：通过=已审批 / 不通过=草稿 / 取消=已取消
        Integer status;
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            status = MesWmEquipmentReceiptStatusEnum.APPROVED.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            status = MesWmEquipmentReceiptStatusEnum.PREPARE.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
            status = MesWmEquipmentReceiptStatusEnum.CANCELED.getStatus();
        } else {
            return;
        }
        if (equipmentReceiptMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
            log.warn("[updateEquipmentReceiptAuditStatus] 设备入库单({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    @Override