From cccbfadcb6e96c23a33c40c0687a27c2f6efa1db Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 13:16:42 +0800
Subject: [PATCH] feat(seal): 添加印章详情及图片预览功能

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java |   19 ++++++++++++++++---
 1 files changed, 16 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 7745b64..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
@@ -44,6 +44,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -142,7 +143,10 @@
     @Transactional(rollbackFor = Exception.class)
     public void submitSalesNotice(Long id, String processDefinitionKey, Long userId) {
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
-        MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
+        MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
+        if (ObjUtil.notEqual(PREPARE.getStatus(), notice.getStatus())) {
+            throw exception(WM_SALES_NOTICE_STATUS_NOT_ALLOW_SUBMIT);
+        }
         // 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
         List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
         if (CollUtil.isEmpty(lines)) {
@@ -163,13 +167,22 @@
         }
         validateSalesNoticeApproveCategoryAndProcessDefinition();
         ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+        // 鍖哄垎銆孠ey 涓嶅瓨鍦�/宸插仠鐢ㄣ�嶄笌銆屾祦绋嬪瓨鍦ㄤ絾涓嶅睘浜庡彂璐у鎵瑰垎绫汇�嶏紝鍒嗗埆缁欏嚭鍙墽琛岀殑鎻愮ず
         if (processDefinition == null) {
-            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+            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)));
+                .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
+                .setVariables(Map.of("businessNo", notice.getCode())));
         salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
                 .setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
     }

--
Gitblit v1.9.3