Merge remote-tracking branch 'origin/dev_business' into dev_business

liyong

4 天以前 be5783c8a7e13bbc76d33c95643d75779cce21db

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wms/approval/listener/WmsTransferStatusListener.java

@@ -4,7 +4,6 @@
import cn.iocoder.yudao.module.mes.service.wms.approval.WmsApprovalService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;

/**
@@ -14,29 +13,38 @@
 */
@Component
@Slf4j
public class WmsTransferStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
public class WmsTransferStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {

    /**
     * 调拨审批流程定义 Key
     */
    private static final String PROCESS_DEFINITION_KEY = "wms_transfer_approve";

    @Resource
    private WmsApprovalService approvalService;

    @Override
    public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
        // 通过 businessKey 查询调拨单
    protected String getProcessDefinitionKey() {
        return PROCESS_DEFINITION_KEY;
    }

    @Override
    protected void onEvent(BpmProcessInstanceStatusEvent event) {
        Long orderId;
        try {
            orderId = Long.parseLong(event.getBusinessKey());
        } catch (NumberFormatException e) {
            return; // businessKey 不是数字，忽略
            log.warn("[onEvent] businessKey({}) 不是有效的数字", event.getBusinessKey());
            return;
        }

        log.info("[onApplicationEvent] 收到BPM审批事件，businessKey={}, status={}",
        log.info("[onEvent] 收到BPM审批事件，businessKey={}, status={}",
                event.getBusinessKey(), event.getStatus());

        // 调用审批服务更新状态
        try {
            approvalService.updateAuditStatus(orderId, "TRANSFER", event.getStatus());
        } catch (Exception e) {
            log.error("[onApplicationEvent] 更新调拨单审批状态失败，orderId={}", orderId, e);
            log.error("[onEvent] 更新调拨单审批状态失败，orderId={}", orderId, e);
        }
    }