From 7a923e32e55e9c34830690341469cc170f65092e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:32:35 +0800
Subject: [PATCH] feat: 完善销售和投标业务流程

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java |   35 ++++-------------------------------
 1 files changed, 4 insertions(+), 31 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 885dec8..9a8c76f 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
@@ -153,38 +153,11 @@
             throw exception(WM_SALES_NOTICE_LINE_EMPTY);
         }
 
-        // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴杩涘叆寰呭嚭搴�
-        if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
-            salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
-                    .setId(id).setProcessInstanceId("").setStatus(APPROVED.getStatus()));
-            reserveSaleOrderOutStatus(notice);
-            return;
-        }
-
-        // 3. 蹇呴』閫夋嫨娴佺▼锛屼笖鍒嗙被涓嬪瓨鍦ㄦ縺娲荤殑娴佺▼瀹氫箟
-        if (StrUtil.isBlank(processDefinitionKey)) {
-            throw exception(WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED);
-        }
-        validateSalesNoticeApproveCategoryAndProcessDefinition();
-        ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
-        // 鍖哄垎銆孠ey 涓嶅瓨鍦�/宸插仠鐢ㄣ�嶄笌銆屾祦绋嬪瓨鍦ㄤ絾涓嶅睘浜庡彂璐у鎵瑰垎绫汇�嶏紝鍒嗗埆缁欏嚭鍙墽琛岀殑鎻愮ず
-        if (processDefinition == null) {
-            throw exception(WM_SALES_NOTICE_BPM_PROCESS_KEY_INVALID, processDefinitionKey);
-        }
-        boolean inDeliveryCategory = bpmProcessDefinitionService
-                .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE).stream()
-                .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. 鍒涘缓瀹℃壒娴佺▼瀹炰緥锛岃繘鍏ュ鎵逛腑
-        String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
-                .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
-                .setVariables(Map.of("businessNo", notice.getCode())));
+        // 鍙戣揣閫氱煡鐢变粨搴撶‘璁ゅ悗鐩存帴鍑哄簱锛屼笉鍐嶅惎鍔ㄥ鎵规祦绋嬨��
         salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
-                .setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
+                .setId(id).setProcessInstanceId("").setStatus(APPROVED.getStatus()));
+        reserveSaleOrderOutStatus(notice);
+
     }
 
     @Override

--
Gitblit v1.9.3