From 321564177399931273e63647f37cdddd268fa5a5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 21:50:35 +0800
Subject: [PATCH] fix: 修复全流程测试 P0/P1 问题
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 786327d..885dec8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -167,10 +167,16 @@
}
validateSalesNoticeApproveCategoryAndProcessDefinition();
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null || bpmProcessDefinitionService
+ // 鍖哄垎銆孠ey 涓嶅瓨鍦�/宸插仠鐢ㄣ�嶄笌銆屾祦绋嬪瓨鍦ㄤ絾涓嶅睘浜庡彂璐у鎵瑰垎绫汇�嶏紝鍒嗗埆缁欏嚭鍙墽琛岀殑鎻愮ず
+ if (processDefinition == null) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_KEY_INVALID, processDefinitionKey);
+ }
+ boolean inDeliveryCategory = bpmProcessDefinitionService
.getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE).stream()
- .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
- throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ .anyMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()));
+ if (!inDeliveryCategory) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_IN_CATEGORY,
+ StrUtil.blankToDefault(processDefinition.getName(), processDefinitionKey));
}
// 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥锛岃繘鍏ュ鎵逛腑
--
Gitblit v1.9.3