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-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java     |   40 ++++++++++++++++----
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java            |   12 ++++-
 yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java |   19 +++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java                |   29 +++++++++++---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java                                      |    6 +++
 yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java                                  |    6 +-
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java              |    4 ++
 7 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
index 21af7b6..8bea654 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
@@ -26,6 +26,7 @@
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.MODEL_DEPLOY_FAIL_TASK_CANDIDATE_NOT_CONFIG;
+import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID;
 
 /**
  * {@link BpmTaskCandidateStrategy} 鐨勮皟鐢ㄨ�咃紝鐢ㄤ簬璋冪敤瀵瑰簲鐨勭瓥鐣ワ紝瀹炵幇浠诲姟鐨勫�欓�変汉鐨勮绠�
@@ -106,8 +107,13 @@
             Integer strategy = BpmnModelUtils.parseCandidateStrategy(flowElement);
             String param = BpmnModelUtils.parseCandidateParam(flowElement);
             Set<Long> userIds = getCandidateStrategy(strategy).calculateUsersByTask(execution, param);
-            // 1.2 绉婚櫎琚鐢ㄧ殑鐢ㄦ埛
-            removeDisableUsers(userIds);
+            ProcessInstance processInstance = SpringUtil.getBean(BpmProcessInstanceService.class)
+                    .getProcessInstance(execution.getProcessInstanceId());
+            Assert.notNull(processInstance, "娴佺▼瀹炰緥({}) 涓嶅瓨鍦�", execution.getProcessInstanceId());
+            Long startUserId = Long.valueOf(processInstance.getStartUserId());
+            // 1.2 绉婚櫎琚鐢ㄧ殑鐢ㄦ埛锛涘彂璧蜂汉鑺傜偣蹇呴』淇濈暀鍙戣捣浜猴紝
+            //     鍚﹀垯鍙戣捣浜鸿处鍙疯绂佺敤鏃惰鑺傜偣鏃犱汉鍙锛屾祦绋嬩細涓�鐩村仠鍦ㄣ�屽彂璧蜂汉銆嶈妭鐐�
+            removeDisableUsers(userIds, isStartUserNode(flowElement) ? startUserId : null);
 
             // 2. 鍊欓�変汉涓虹┖鏃讹紝鏍规嵁鈥滃鎵逛汉涓虹┖鈥濈殑閰嶇疆琛ュ厖
             if (CollUtil.isEmpty(userIds)) {
@@ -117,10 +123,7 @@
             }
 
             // 3. 绉婚櫎鍙戣捣浜虹殑鐢ㄦ埛
-            ProcessInstance processInstance = SpringUtil.getBean(BpmProcessInstanceService.class)
-                    .getProcessInstance(execution.getProcessInstanceId());
-            Assert.notNull(processInstance, "娴佺▼瀹炰緥({}) 涓嶅瓨鍦�", execution.getProcessInstanceId());
-            removeStartUserIfSkip(userIds, flowElement, Long.valueOf(processInstance.getStartUserId()));
+            removeStartUserIfSkip(userIds, flowElement, startUserId);
             return userIds;
         });
     }
@@ -146,8 +149,8 @@
         String param = BpmnModelUtils.parseCandidateParam(flowElement);
         Set<Long> userIds = getCandidateStrategy(strategy).calculateUsersByActivity(bpmnModel, activityId, param,
                 startUserId, processDefinitionId, processVariables);
-        // 1.2 绉婚櫎琚鐢ㄧ殑鐢ㄦ埛
-        removeDisableUsers(userIds);
+        // 1.2 绉婚櫎琚鐢ㄧ殑鐢ㄦ埛锛涘彂璧蜂汉鑺傜偣蹇呴』淇濈暀鍙戣捣浜猴紝閬垮厤鍙戣捣浜虹鐢ㄥ悗娴佺▼鍋滃湪銆屽彂璧蜂汉銆嶈妭鐐�
+        removeDisableUsers(userIds, START_USER_NODE_ID.equals(activityId) ? startUserId : null);
 
         // 2. 鍊欓�変汉涓虹┖鏃讹紝鏍规嵁鈥滃鎵逛汉涓虹┖鈥濈殑閰嶇疆琛ュ厖
         if (CollUtil.isEmpty(userIds)) {
@@ -163,17 +166,38 @@
 
     @VisibleForTesting
     void removeDisableUsers(Set<Long> assigneeUserIds) {
+        removeDisableUsers(assigneeUserIds, null);
+    }
+
+    /**
+     * 绉婚櫎琚鐢ㄧ殑鐢ㄦ埛
+     *
+     * @param assigneeUserIds 鍊欓�変汉
+     * @param keepUserId      闇�瑕佷繚鐣欑殑鐢ㄦ埛锛堝彂璧蜂汉鑺傜偣淇濈暀鍙戣捣浜猴級锛屽彲涓虹┖
+     */
+    @VisibleForTesting
+    void removeDisableUsers(Set<Long> assigneeUserIds, Long keepUserId) {
         if (CollUtil.isEmpty(assigneeUserIds)) {
             return;
         }
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assigneeUserIds);
         assigneeUserIds.removeIf(id -> {
+            if (ObjectUtil.equal(id, keepUserId)) {
+                return false;
+            }
             AdminUserRespDTO user = userMap.get(id);
             return user == null || CommonStatusEnum.isDisable(user.getStatus());
         });
     }
 
     /**
+     * 鏄惁涓恒�屽彂璧蜂汉銆嶈妭鐐�
+     */
+    private static boolean isStartUserNode(FlowElement flowElement) {
+        return flowElement != null && START_USER_NODE_ID.equals(flowElement.getId());
+    }
+
+    /**
      * 濡傛灉鈥滃鎵逛汉涓庡彂璧蜂汉鐩稿悓鏃垛�濓紝閰嶇疆浜� SKIP 璺宠繃锛屽垯绉婚櫎鍙戣捣浜�
      *
      * 娉ㄦ剰锛氬鏋滃彧鏈変竴涓�欓�変汉锛屽垯涓嶅鐞嗭紝閬垮厤鏃犳硶瀹℃壒
diff --git a/yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java b/yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java
index 4cf15a9..6117f1c 100644
--- a/yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java
+++ b/yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java
@@ -272,4 +272,23 @@
         assertEquals(asSet(1L), assigneeUserIds);
     }
 
+    @Test
+    public void testRemoveDisableUsers_keepDisabledUser() {
+        // 鍑嗗鍙傛暟锛�2L 琚鐢紝浣嗗畠鏄彂璧蜂汉鑺傜偣闇�瑕佷繚鐣欑殑鍙戣捣浜猴紱3L 鎵句笉鍒�
+        Set<Long> assigneeUserIds = asSet(1L, 2L, 3L);
+        // mock 鏂规硶
+        AdminUserRespDTO user1 = randomPojo(AdminUserRespDTO.class, o -> o.setId(1L)
+                .setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        AdminUserRespDTO user2 = randomPojo(AdminUserRespDTO.class, o -> o.setId(2L)
+                .setStatus(CommonStatusEnum.DISABLE.getStatus()));
+        Map<Long, AdminUserRespDTO> userMap = MapUtil.builder(user1.getId(), user1)
+                .put(user2.getId(), user2).build();
+        when(adminUserApi.getUserMap(eq(assigneeUserIds))).thenReturn(userMap);
+
+        // 璋冪敤
+        taskCandidateInvoker.removeDisableUsers(assigneeUserIds, 2L);
+        // 鏂█锛氫繚鐣欒绂佺敤鐨勫彂璧蜂汉 2L锛岀Щ闄や笉瀛樺湪鐨� 3L
+        assertEquals(asSet(1L, 2L), assigneeUserIds);
+    }
+
 }
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index a7c40bd..9b284bb 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -174,8 +174,8 @@
     ErrorCode SCHEDULE_ITEM_LIST_EMPTY = new ErrorCode(1_030_010_000, "鎺掔彮鏁版嵁涓嶈兘涓虹┖");
     ErrorCode SCHEDULE_SHIFT_NOT_EXISTS = new ErrorCode(1_030_010_001, "鎺掔彮寮曠敤鐨勭彮娆′笉瀛樺湪");
     ErrorCode SCHEDULE_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_030_010_002, "鎺掔彮寮曠敤鐨勫憳宸ヤ笉瀛樺湪");
-    ErrorCode SCHEDULE_BATCH_DATE_RANGE_INVALID = new ErrorCode(1_030_010_003, "鎵归噺鎺掔彮鏃ユ湡鍖洪棿涓嶅悎娉曪細缁撴潫鏃ユ湡[%s]鏃╀簬寮�濮嬫棩鏈焄%s]锛岃璋冩暣鍚庨噸璇�");
-    ErrorCode SCHEDULE_BATCH_RANGE_TOO_LONG = new ErrorCode(1_030_010_004, "鎵归噺鎺掔彮鏃ユ湡鍖洪棿涓篬%s ~ %s]锛屽叡 %s 澶╋紝瓒呰繃鍗曟鏈�澶� 62 澶╃殑闄愬埗锛岃鍒嗘鎺掔彮");
-    ErrorCode SCHEDULE_BATCH_NO_EMPLOYEE = new ErrorCode(1_030_010_005, "閮ㄩ棬[%s]锛堝惈涓嬬骇閮ㄩ棬锛変笅娌℃湁绗﹀悎鏉′欢鐨勫憳宸ワ紙宀椾綅锛�%s锛屽憳宸ョ姸鎬侊細%s锛夛紝鏈敓鎴愪换浣曟帓鐝紝璇疯皟鏁寸瓫閫夋潯浠跺悗閲嶈瘯");
+    ErrorCode SCHEDULE_BATCH_DATE_RANGE_INVALID = new ErrorCode(1_030_010_003, "鎵归噺鎺掔彮鏃ユ湡鍖洪棿涓嶅悎娉曪細缁撴潫鏃ユ湡[{}]鏃╀簬寮�濮嬫棩鏈焄{}]锛岃璋冩暣鍚庨噸璇�");
+    ErrorCode SCHEDULE_BATCH_RANGE_TOO_LONG = new ErrorCode(1_030_010_004, "鎵归噺鎺掔彮鏃ユ湡鍖洪棿涓篬{} ~ {}]锛屽叡 {} 澶╋紝瓒呰繃鍗曟鏈�澶� 62 澶╃殑闄愬埗锛岃鍒嗘鎺掔彮");
+    ErrorCode SCHEDULE_BATCH_NO_EMPLOYEE = new ErrorCode(1_030_010_005, "閮ㄩ棬[{}]锛堝惈涓嬬骇閮ㄩ棬锛変笅娌℃湁绗﹀悎鏉′欢鐨勫憳宸ワ紙宀椾綅锛歿}锛屽憳宸ョ姸鎬侊細{}锛夛紝鏈敓鎴愪换浣曟帓鐝紝璇疯皟鏁寸瓫閫夋潯浠跺悗閲嶈瘯");
 
 }
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
index 56d350a..9d01827 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceSummaryDO.java
@@ -2,6 +2,7 @@
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -43,7 +44,10 @@
 
     /**
      * 骞存湀锛屾牸寮忥細yyyy-MM
+     *
+     * 娉ㄦ剰锛歒EAR_MONTH 鏄� MySQL 淇濈暀瀛楋紝瀛楁鍚嶅繀椤诲姞鍙嶅紩鍙凤紝鍚﹀垯鐢熸垚鐨� SQL 浼氭姤璇硶閿欒
      */
+    @TableField("`year_month`")
     private String yearMonth;
 
     /**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 1184bfc..5973c09 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -358,6 +358,8 @@
             "宸ュ崟宸插紑鍚姤宸ュ鎵癸紝浣嗘湭閰嶇疆瀹℃壒娴佺▼锛岃鍏堜负宸ュ崟閰嶇疆娴佺▼鍚庡啀鎻愪氦鎶ュ伐");
     ErrorCode PRO_FEEDBACK_APPROVAL_PROCESS_KEY_INVALID = new ErrorCode(1_040_506_022,
             "宸ュ崟閰嶇疆鐨勬姤宸ュ鎵规祦绋嬫湭婵�娲绘垨涓嶅睘浜庢姤宸ュ鎵瑰垎绫伙紝璇锋鏌ュ伐鍗曞鎵归厤缃�");
+    ErrorCode PRO_FEEDBACK_APPROVAL_HANDLE_IN_BPM = new ErrorCode(1_040_506_023,
+            "璇ユ姤宸ュ崟宸插彂璧峰鎵规祦绋嬶紝涓嶈兘鍦ㄦ姤宸ラ〉闈㈢洿鎺ラ�氳繃鎴栨嫆缁濓紱璇峰鎵逛汉鍓嶅線銆屽緟鍔炰换鍔°�嶅鐞嗚娴佺▼锛屾祦绋嬬粨鏉熷悗鎶ュ伐鐘舵�佷細鑷姩鏇存柊");
 
     // ========== MES 鐢熶骇绠$悊-杈呭姪宸ユ椂閰嶇疆锛�1-040-510-000锛� ==========
     ErrorCode PRO_WORKTIME_AUX_NOT_EXISTS = new ErrorCode(1_040_510_000, "杈呭姪宸ユ椂椤圭洰涓嶅瓨鍦�");
@@ -858,6 +860,10 @@
     ErrorCode WM_SALES_NOTICE_ALREADY_EXISTS = new ErrorCode(1_040_720_015, "璇ラ攢鍞鍗曞凡鐢熸垚鍙戣揣閫氱煡鍗曪紝涓嶈兘閲嶅鐢熸垚");
     ErrorCode WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED = new ErrorCode(1_040_720_020, "鎻愪氦鍙戣揣瀹℃壒鍓嶅繀椤婚�夋嫨瀹℃壒娴佺▼锛氭湭浼犳祦绋嬪畾涔� Key");
     ErrorCode WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_720_021, "鍙戣揣瀹℃壒娴佺▼鏈厤缃細璇峰厛鍦ㄣ�屾祦绋嬬鐞嗐�嶄腑璁捐骞跺惎鐢ㄣ�屽彂璐у鎵广�嶆祦绋嬶紝鍐嶆彁浜ゅ彂璐у崟");
+    ErrorCode WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_IN_CATEGORY = new ErrorCode(1_040_720_024,
+            "鎵�閫夊鎵规祦绋媅{}]涓嶅睘浜庛�屽彂璐у鎵广�嶅垎绫伙紝涓嶈兘鐢ㄤ簬鍙戣揣鍗曞鎵癸紱璇峰湪鎻愪氦鏃堕�夋嫨鍙戣揣瀹℃壒鍒嗙被涓嬬殑娴佺▼");
+    ErrorCode WM_SALES_NOTICE_BPM_PROCESS_KEY_INVALID = new ErrorCode(1_040_720_025,
+            "鎵�閫夊鎵规祦绋� Key[{}] 涓嶅瓨鍦ㄦ垨宸插仠鐢紝璇烽噸鏂伴�夋嫨銆屽彂璐у鎵广�嶅垎绫讳笅宸插惎鐢ㄧ殑娴佺▼");
     ErrorCode WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING = new ErrorCode(1_040_720_022, "鍙戣揣鍗�({})褰撳墠鐘舵�佷负[{}]锛屼笉澶勪簬瀹℃壒涓紝鏃犳硶鏇存柊瀹℃壒缁撴灉");
     ErrorCode WM_SALES_NOTICE_STATUS_NOT_ALLOW_SUBMIT = new ErrorCode(1_040_720_023, "鍙湁鑽夌鐘舵�佺殑鍙戣揣閫氱煡鍗曟墠鑳芥彁浜ゅ鎵�");
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index b097178..cb90136 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -352,21 +352,29 @@
                  reqVO.setLotNumber(reason);
                }
             }
-            approveFeedback(reqVO);
+            // BPM 鍥炶皟鏃舵祦绋嬪疄渚嬩粛鍦ㄨ繍琛岋紝蹇呴』璧板唴閮ㄦ柟娉曪紝涓嶈兘琚�屽凡鍙戣捣娴佺▼銆嶇殑鏍¢獙鎷︿綇
+            doApproveFeedback(reqVO, feedback, true);
         } else if (cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(bpmResult) ||
                    cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
-            rejectFeedback(id);
+            doRejectFeedback(id);
         }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void rejectFeedback(Long id) {
-        equipmentService.lock();
         // 1. 鏍¢獙瀛樺湪 + 瀹℃壒涓姸鎬�
-        validateFeedbackStatusApproving(id);
+        MesProFeedbackDO feedback = validateFeedbackStatusApproving(id);
+        // 1.1 宸插彂璧峰鎵规祦绋嬬殑鎶ュ伐鍗曞彧鑳界敱瀹℃壒浜洪�氳繃銆屽緟鍔炰换鍔°�嶅鐞嗭紝閬垮厤涓氬姟鎺ュ彛缁曡繃娴佺▼
+        if (StrUtil.isNotBlank(feedback.getProcessInstanceId())) {
+            throw exception(PRO_FEEDBACK_APPROVAL_HANDLE_IN_BPM);
+        }
+        doRejectFeedback(id);
+    }
 
-        // 2. 鏇存柊鐘舵�佷负鑽夌
+    private void doRejectFeedback(Long id) {
+        equipmentService.lock();
+        // 1. 鏇存柊鐘舵�佷负鑽夌
         feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
                 .setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus()));
     }
@@ -378,9 +386,18 @@
     }
 
     private boolean approveFeedback(MesProFeedbackApproveReqVO reqVO, boolean enforceQualityGate) {
-        equipmentService.lock();
         // 1.1 鏍¢獙瀛樺湪 + 瀹℃壒涓姸鎬�
         MesProFeedbackDO feedback = validateFeedbackStatusApproving(reqVO.getId());
+        // 1.2 宸插彂璧峰鎵规祦绋嬬殑鎶ュ伐鍗曞彧鑳界敱瀹℃壒浜洪�氳繃銆屽緟鍔炰换鍔°�嶅鐞嗭紝閬垮厤涓氬姟鎺ュ彛缁曡繃娴佺▼
+        if (StrUtil.isNotBlank(feedback.getProcessInstanceId())) {
+            throw exception(PRO_FEEDBACK_APPROVAL_HANDLE_IN_BPM);
+        }
+        return doApproveFeedback(reqVO, feedback, enforceQualityGate);
+    }
+
+    private boolean doApproveFeedback(MesProFeedbackApproveReqVO reqVO, MesProFeedbackDO feedback,
+                                      boolean enforceQualityGate) {
+        equipmentService.lock();
         equipmentService.validateApproval(feedback);
         try (var equipmentScope = equipmentService.beginApproval(feedback)) {
             return approveValidatedFeedback(reqVO, feedback, enforceQualityGate);
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