From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/listener/MesWmMiscReceiptStatusListener.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/listener/MesWmMiscReceiptStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/listener/MesWmMiscReceiptStatusListener.java
index 17ab0b8..b617989 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/listener/MesWmMiscReceiptStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/listener/MesWmMiscReceiptStatusListener.java
@@ -1,44 +1,45 @@
package cn.iocoder.yudao.module.mes.service.wm.miscreceipt.listener;
import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
import cn.iocoder.yudao.module.mes.service.wm.miscreceipt.MesWmMiscReceiptService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
- * 鏉傞」鍏ュ簱鍗� BPM 瀹℃壒鐘舵�佺洃鍚櫒
+ * MES 鏉傞」鍏ュ簱鍗曞鎵圭姸鎬佺洃鍚櫒
*
- * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊鏉傞」鍏ュ簱鍗曠殑瀹℃壒鐘舵��
+ * 鐩戝惉 BPM 瀹℃壒缁撴灉锛屽洖鍐欐潅椤瑰叆搴撳崟鐘舵�侊紝浣垮鎵圭粺涓�鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆嶄腑娴佽浆銆�
*/
@Component
@Slf4j
-public class MesWmMiscReceiptStatusListener
- extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {
+public class MesWmMiscReceiptStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ private static final String PROCESS_DEFINITION_KEY = "misc_receipt_approve";
@Resource
private MesWmMiscReceiptService miscReceiptService;
@Override
protected String getProcessDefinitionKey() {
- return MesWmMiscReceiptService.APPROVE_CATEGORY_CODE;
+ return PROCESS_DEFINITION_KEY;
}
@Override
protected void onEvent(BpmProcessInstanceStatusEvent event) {
- Long id;
+ Long receiptId;
try {
- id = Long.parseLong(event.getBusinessKey());
+ receiptId = Long.parseLong(event.getBusinessKey());
} catch (NumberFormatException e) {
log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勬潅椤瑰叆搴撳崟缂栧彿", event.getBusinessKey());
return;
}
- log.info("[onEvent] 鏀跺埌BPM瀹℃壒浜嬩欢锛宮iscReceiptId={}, status={}", id, event.getStatus());
+ log.info("[onEvent] 鏀跺埌鏉傞」鍏ュ簱鍗曞鎵逛簨浠讹紝receiptId={}, status={}", receiptId, event.getStatus());
try {
- miscReceiptService.updateMiscReceiptAuditStatus(id, event.getStatus());
- log.info("[onEvent] 鏉傞」鍏ュ簱鍗�({}) 瀹℃壒鐘舵�佹洿鏂板畬鎴�", id);
+ miscReceiptService.updateMiscReceiptAuditStatus(receiptId, event.getStatus(), event.getReason());
} catch (Exception e) {
- log.error("[onEvent] 鏇存柊鏉傞」鍏ュ簱鍗曞鎵圭姸鎬佸け璐ワ紝miscReceiptId={}", id, e);
+ log.error("[onEvent] 鍥炲啓鏉傞」鍏ュ簱鍗曞鎵圭姸鎬佸け璐ワ紝receiptId={}", receiptId, e);
}
}
--
Gitblit v1.9.3