From defe1e1c3ade87de0a7990f565f08f93aeb2decc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:31:46 +0800
Subject: [PATCH] fix(bpm): 统一审批标题单号并收紧各模块提交校验

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java |  177 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 158 insertions(+), 19 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 eb42a1f..786327d 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
@@ -2,8 +2,15 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
@@ -15,23 +22,30 @@
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeLineMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
 import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
 import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
 import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
 import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+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;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -45,13 +59,18 @@
 @Slf4j
 public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
 
+    /**
+     * BPM 鍙戣揣瀹℃壒鍒嗙被缂栫爜锛堝鎵逛汉榛樿涓虹墿娴侊級
+     */
+    private static final String SALES_DELIVERY_APPROVE_CATEGORY_CODE = "sales_delivery_approve";
+
     @Resource
     private MesWmSalesNoticeMapper salesNoticeMapper;
 
     @Resource
     private MesWmSalesNoticeLineService salesNoticeLineService;
     @Resource
-    private MesMdClientService clientService;
+    private CrmCustomerApi customerApi;
 
     @Resource
     private ErpSaleOrderApi saleOrderApi;
@@ -65,6 +84,13 @@
     @Resource
     private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
 
+    @Resource
+    private BpmProcessInstanceApi bpmProcessInstanceApi;
+    @Resource
+    private BpmCategoryService bpmCategoryService;
+    @Resource
+    private BpmProcessDefinitionService bpmProcessDefinitionService;
+
     @Override
     public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
         // 鏍¢獙鏁版嵁
@@ -73,6 +99,8 @@
         // 鎻掑叆
         MesWmSalesNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmSalesNoticeDO.class);
         notice.setStatus(PREPARE.getStatus()); // 鑽夌鐘舵��
+        notice.setExpressFee(notice.getExpressFee() == null ? BigDecimal.ZERO : notice.getExpressFee());
+        notice.setInvoiceStatus(notice.getInvoiceStatus() == null ? 0 : notice.getInvoiceStatus());
         salesNoticeMapper.insert(notice);
         return notice.getId();
     }
@@ -108,28 +136,128 @@
 
     @Override
     public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
-        return salesNoticeMapper.selectPage(pageReqVO);
+        return salesNoticeMapper.selectPage(pageReqVO, (List<Long>) null);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void submitSalesNotice(Long id) {
+    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)) {
             throw exception(WM_SALES_NOTICE_LINE_EMPTY);
         }
 
-        // 2. 鏇存柊鐘舵�侊細鑽夌 鈫� 寰呭嚭搴�
-        salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
-                .setId(id).setStatus(APPROVED.getStatus()));
+        // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴杩涘叆寰呭嚭搴�
+        if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+            salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+                    .setId(id).setProcessInstanceId("").setStatus(APPROVED.getStatus()));
+            reserveSaleOrderOutStatus(notice);
+            return;
+        }
 
-        // 3. 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"宸查鐣�"
+        // 3. 蹇呴』閫夋嫨娴佺▼锛屼笖鍒嗙被涓嬪瓨鍦ㄦ縺娲荤殑娴佺▼瀹氫箟
+        if (StrUtil.isBlank(processDefinitionKey)) {
+            throw exception(WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED);
+        }
+        validateSalesNoticeApproveCategoryAndProcessDefinition();
+        ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+        if (processDefinition == null || 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);
+        }
+
+        // 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()));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSalesNoticeAuditStatus(Long id, Integer bpmResult) {
+        MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
+        if (ObjUtil.notEqual(APPROVING.getStatus(), notice.getStatus())) {
+            MesWmSalesNoticeStatusEnum current = MesWmSalesNoticeStatusEnum.getByStatus(notice.getStatus());
+            log.error("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 涓嶅浜庡鎵逛腑锛屽綋鍓嶇姸鎬�({})锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+                    id, current != null ? current.getName() : notice.getStatus(), bpmResult);
+            throw exception(WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING, notice.getCode(),
+                    current != null ? current.getName() : String.valueOf(notice.getStatus()));
+        }
+        if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+            // 瀹℃壒閫氳繃锛氳繘鍏ュ緟鍑哄簱锛屽苟鍥炲啓閿�鍞鍗曞嚭搴撶姸鎬�
+            salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(APPROVED.getStatus()));
+            reserveSaleOrderOutStatus(notice);
+        } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.REJECT.getStatus())
+                || ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+            // 椹冲洖/鍙栨秷锛氶��鍥炶崏绋匡紝鍏佽淇敼鍚庨噸鏂版彁浜�
+            salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(PREPARE.getStatus()));
+        } else {
+            log.warn("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 鏀跺埌鏈煡瀹℃壒缁撴灉({})锛屽拷鐣", id, bpmResult);
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getSalesNoticeApproveProcessDefinitionList() {
+        validateSalesNoticeApproveCategoryAndProcessDefinition();
+        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+                .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+        Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+                .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+        List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+        Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+        for (ProcessDefinition pd : processDefinitions) {
+            if (pd.isSuspended()) {
+                continue;
+            }
+            ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+            if (existing == null || pd.getVersion() > existing.getVersion()) {
+                latestVersionMap.put(pd.getKey(), pd);
+            }
+        }
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (ProcessDefinition pd : latestVersionMap.values()) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("id", pd.getId());
+            item.put("key", pd.getKey());
+            item.put("name", pd.getName());
+            item.put("version", pd.getVersion());
+            result.add(item);
+        }
+        return result;
+    }
+
+    private void reserveSaleOrderOutStatus(MesWmSalesNoticeDO notice) {
         if (notice.getSaleOrderId() != null) {
             saleOrderApi.updateOrderOutStatusTo(notice.getSaleOrderId(),
                     ErpSaleOrderOutStatusEnum.RESERVED.getStatus());
+        }
+    }
+
+    private void validateSalesNoticeApproveCategoryAndProcessDefinition() {
+        List<String> codes = Collections.singletonList(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+        Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
+        if (!categoryMap.containsKey(SALES_DELIVERY_APPROVE_CATEGORY_CODE)) {
+            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+        }
+        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+                .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+        if (CollUtil.isEmpty(definitionInfoList)) {
+            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+        }
+        Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+                .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+        List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+        if (processDefinitions.stream().noneMatch(pd -> !pd.isSuspended())) {
+            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
         }
     }
 
@@ -166,7 +294,7 @@
         validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
         // 鏍¢獙瀹㈡埛瀛樺湪
         if (saveReqVO.getClientId() != null) {
-            clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
+            customerApi.validateCustomer(saveReqVO.getClientId());
         }
     }
 
@@ -183,22 +311,28 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
-        // 1. 鑾峰彇閿�鍞鍗曚俊鎭�
+        // 1. 鏍¢獙鏄惁宸茬敓鎴愯繃鍙戣揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
+        MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
+        if (existNotice != null) {
+            throw exception(WM_SALES_NOTICE_ALREADY_EXISTS);
+        }
+
+        // 2. 鑾峰彇閿�鍞鍗曚俊鎭�
         ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
         if (saleOrder == null) {
             throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
         }
 
-        // 2. 鑾峰彇閿�鍞鍗曟槑缁�
+        // 3. 鑾峰彇閿�鍞鍗曟槑缁�
         List<ErpSaleOrderItemRespDTO> saleOrderItems = saleOrderApi.getSaleOrderItemList(saleOrderId).getCheckedData();
         if (CollUtil.isEmpty(saleOrderItems)) {
             throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
         }
 
-        // 3. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
+        // 4. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
         String code = autoCodeRecordService.generateAutoCode("SALESNOTICE_CODE", null);
 
-        // 4. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
+        // 5. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
         MesWmSalesNoticeDO notice = new MesWmSalesNoticeDO();
         notice.setCode(code);
         notice.setName("閿�鍞鍗昜" + saleOrder.getNo() + "]鍙戣揣閫氱煡");
@@ -209,7 +343,7 @@
         notice.setStatus(PREPARE.getStatus());
         salesNoticeMapper.insert(notice);
 
-        // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+        // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
         for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
             MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
             line.setNoticeId(notice.getId());
@@ -315,16 +449,21 @@
             throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
         }
 
-        // 2. 鑾峰彇鍙戣揣閫氱煡鍗曡
+        // 2. 鏍¢獙鏄惁宸茬敓鎴愯繃閿�鍞嚭搴撳崟锛堥槻姝㈤噸澶嶇敓鎴愶級
+        if (productSalesMapper.selectByNoticeId(noticeId) != null) {
+            throw exception(WM_PRODUCT_SALES_ALREADY_EXISTS);
+        }
+
+        // 3. 鑾峰彇鍙戣揣閫氱煡鍗曡
         List<MesWmSalesNoticeLineDO> noticeLines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(noticeId);
         if (CollUtil.isEmpty(noticeLines)) {
             throw exception(WM_SALES_NOTICE_LINE_EMPTY);
         }
 
-        // 3. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
+        // 4. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
         String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);
 
-        // 4. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
+        // 5. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
         MesWmProductSalesDO productSales = new MesWmProductSalesDO();
         productSales.setCode(code);
         productSales.setName("鍙戣揣閫氱煡鍗昜" + notice.getCode() + "]鍑哄簱");
@@ -340,7 +479,7 @@
         productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
         productSalesMapper.insert(productSales);
 
-        // 5. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+        // 6. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
         for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
             MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
             salesLine.setSalesId(productSales.getId());

--
Gitblit v1.9.3