From 1d9cfc91e7255b9e139b20ff230cb19246f19193 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 14:32:11 +0800
Subject: [PATCH] refactor(erp): 重构ERP单据单号生成逻辑以支持冲突重试

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index 04dc2d5..92d38a8 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -28,6 +28,7 @@
 import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
 import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
 import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpSaleTypeEnum;
 import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
 import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
 import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -127,6 +128,8 @@
         List<ErpSaleOrderItemDO> saleOrderItems = validateSaleOrderItems(createReqVO.getItems());
         // 1.2 鏍¢獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
         customerApi.validateCustomer(createReqVO.getCustomerId());
+        // 1.2.1 鏍¢獙閿�鍞被鍨�
+        validateSaleType(createReqVO.getSaleType());
         // 1.3 鏍¢獙缁撶畻璐︽埛
         if (createReqVO.getAccountId() != null) {
             accountService.validateAccount(createReqVO.getAccountId());
@@ -136,10 +139,8 @@
             adminUserApi.validateUser(createReqVO.getSaleUserId());
         }
         // 1.5 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
-        String no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
-        if (saleOrderMapper.selectByNo(no) != null) {
-            throw exception(SALE_ORDER_NO_EXISTS);
-        }
+        String no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX,
+                candidate -> saleOrderMapper.selectByNo(candidate) != null);
 
         // 2.1 鎻掑叆璁㈠崟锛堝垱寤哄悗涓烘湭鎻愪氦鐘舵�侊紝闇�鎵嬪姩鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏級
         ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
@@ -169,6 +170,8 @@
         }
         // 1.3 鏍¢獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
         customerApi.validateCustomer(updateReqVO.getCustomerId());
+        // 1.3.1 鏍¢獙閿�鍞被鍨�
+        validateSaleType(updateReqVO.getSaleType());
         // 1.3 鏍¢獙缁撶畻璐︽埛
         if (updateReqVO.getAccountId() != null) {
             accountService.validateAccount(updateReqVO.getAccountId());
@@ -285,6 +288,10 @@
             }
             ErpSaleOrderSaveReqVO.Item itemVO = new ErpSaleOrderSaveReqVO.Item();
             itemVO.setProductId(item.getId());
+            if (row.getReelNo() != null && row.getReelNo().length() > 128) {
+                throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鐨勭洏鍙蜂笉鑳借秴杩�128涓瓧绗�");
+            }
+            itemVO.setReelNo(row.getReelNo());
             itemVO.setProductUnitId(item.getUnitMeasureId());
             // 鍗曚环锛氭湭濉啓鏃跺彇鐗╂枡鐨勯攢鍞环锛堜笌椤甸潰閫変骇鍝佸悗鐨勯粯璁ゅ�间竴鑷达級
             itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
@@ -297,10 +304,15 @@
         }
 
         // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
-        String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
-                : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
-        if (saleOrderMapper.selectByNo(no) != null) {
-            throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
+        String no;
+        if (StrUtil.isNotBlank(head.getNo())) {
+            no = head.getNo().trim();
+            if (saleOrderMapper.selectByNo(no) != null) {
+                throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
+            }
+        } else {
+            no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX,
+                    candidate -> saleOrderMapper.selectByNo(candidate) != null);
         }
 
         // 4. 缁勮涓昏〃锛氬鍏ュ悗鍥哄畾涓衡�滄湭鎻愪氦(0)鈥濈姸鎬�
@@ -321,6 +333,12 @@
         itemDOs.forEach(item -> item.setOrderId(saleOrder.getId()));
         saleOrderItemMapper.insertBatch(itemDOs);
         return saleOrder;
+    }
+
+    private void validateSaleType(Integer saleType) {
+        if (!ErpSaleTypeEnum.isValid(saleType)) {
+            throw exception(SALE_ORDER_SALE_TYPE_INVALID, saleType);
+        }
     }
 
     /**
@@ -400,7 +418,24 @@
             throw exception(SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY, saleOrder.getNo());
         }
 
-        // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
+        // 4. 鍚堝悓杞潵鐨勯攢鍞鍗曪紙contractId 闈炵┖锛夋棤闇�鍐嶈蛋瀹℃壒锛�
+        //    鍚堝悓鍦� CRM 宸插鎵归�氳繃锛岃鍗曞唴瀹圭敱鍚堝悓甯﹀叆锛屾彁浜ゅ嵆鐢熸晥銆�
+        //    鐢熸晥鍚庯細闇�瑕佺敓浜х殑鏄庣粏鑷姩鍒涘缓 MPS 娴佽浆鐢熶骇妯″潡锛涙棤闇�鐢熶骇鐨勬槑缁嗗彲鐩存帴鍦ㄤ粨鍌ㄧ敓鎴愬彂璐ч�氱煡鍗曘��
+        //    鍘嗗彶鍚堝悓鐢熸垚鐨勮鍗曟槑缁嗗彲鑳芥湭缁存姢鈥滄槸鍚﹂渶瑕佺敓浜р�濓紝鎸夌郴缁熼粯璁わ紙闇�瑕佺敓浜э級琛ラ綈鍚庡啀鐢熸晥銆�
+        if (saleOrder.getContractId() != null) {
+            items.stream()
+                    .filter(item -> item.getNeedProduction() == null)
+                    .forEach(item -> saleOrderItemMapper.updateById(
+                            new ErpSaleOrderItemDO().setId(item.getId()).setNeedProduction(1)));
+            saleOrderMapper.updateById(new ErpSaleOrderDO()
+                    .setId(id)
+                    .setStatus(ErpAuditStatus.APPROVING.getStatus())
+                    .setProcessInstanceId(""));
+            updateSaleOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+            return;
+        }
+
+        // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
         // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
         if (processInstanceApi.isGlobalAutoApprove()) {
             saleOrderMapper.updateById(new ErpSaleOrderDO()
@@ -416,7 +451,7 @@
                         .setProcessDefinitionKey(processDefinitionKey)
                         .setBusinessKey(String.valueOf(id)));
 
-        // 5. 鏇存柊閿�鍞鍗曠姸鎬佷负瀹℃壒涓紝璁板綍娴佺▼瀹炰緥缂栧彿
+        // 6. 鏇存柊閿�鍞鍗曠姸鎬佷负瀹℃壒涓紝璁板綍娴佺▼瀹炰緥缂栧彿
         saleOrderMapper.updateById(new ErpSaleOrderDO()
                 .setId(id)
                 .setStatus(ErpAuditStatus.APPROVING.getStatus())

--
Gitblit v1.9.3