From b490500184a57b740c016bb281765fe29731eab5 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 17 九月 2026 11:18:48 +0800
Subject: [PATCH] fix(erp): 销售订单审核不再被 MPS 创建失败连带回滚
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 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 42ab39c..1f79429 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
@@ -23,10 +23,14 @@
import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
@@ -44,7 +48,7 @@
/**
* ERP 閿�鍞鍗� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -75,6 +79,22 @@
private MesProMpsApi mpsApi;
@Resource
+ private PlatformTransactionManager transactionManager;
+
+ /**
+ * MPS 鍒涘缓浣跨敤鐙珛浜嬪姟锛圧EQUIRES_NEW锛夛細
+ * 瀹℃牳鏃惰嚜鍔ㄥ垱寤� MPS 灞炰簬灏藉姏鑰屼负鐨勮仈鍔紝澶辫触浠呰褰曟棩蹇楀苟鍥炴粴鑷韩锛�
+ * 涓嶈兘姹℃煋閿�鍞鍗曞鏍镐簨鍔★紙鍚﹀垯鍐呭眰寮傚父浼氭妸澶栧眰浜嬪姟鏍囪涓� rollback-only锛屽鑷存暣涓鏍歌鍥炴粴锛�
+ */
+ private TransactionTemplate mpsTransactionTemplate;
+
+ @PostConstruct
+ public void initMpsTransactionTemplate() {
+ mpsTransactionTemplate = new TransactionTemplate(transactionManager);
+ mpsTransactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+ }
+
+ @Resource
private StorageAttachmentApi storageAttachmentApi;
@Override
@@ -101,6 +121,7 @@
// 2.1 鎻掑叆璁㈠崟
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
.setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setDepositPrice(ObjectUtil.defaultIfNull(createReqVO.getDepositPrice(), BigDecimal.ZERO))
.setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
@@ -136,16 +157,13 @@
// 2.1 鏇存柊璁㈠崟
ErpSaleOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpSaleOrderDO.class);
+ updateObj.setDepositPrice(ObjectUtil.defaultIfNull(updateReqVO.getDepositPrice(), BigDecimal.ZERO));
calculateTotalPrice(updateObj, saleOrderItems);
saleOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
updateSaleOrderItemList(updateReqVO.getId(), saleOrderItems);
// 2.3 鏇存柊闄勪欢
- if (updateReqVO.getBlobIds() != null) {
- storageAttachmentApi.deleteAttachmentsByRecord("erp_sale_order", updateReqVO.getId());
- storageAttachmentApi.bindAttachments("file", "erp_sale_order",
- updateReqVO.getId(), updateReqVO.getBlobIds());
- }
+ storageAttachmentApi.updateAttachments("file", "erp_sale_order", updateReqVO.getId(), updateReqVO.getBlobIds());
}
private void calculateTotalPrice(ErpSaleOrderDO saleOrder, List<ErpSaleOrderItemDO> saleOrderItems) {
@@ -208,13 +226,19 @@
continue;
}
try {
- Long mpsId = createMpsForSaleOrderItem(saleOrder, item);
+ // 鐙珛浜嬪姟鍒涘缓 MPS锛氬け璐ュ彧鍥炴粴 MPS 鑷韩锛屼笉褰卞搷瀹℃牳浜嬪姟
+ Long mpsId = mpsTransactionTemplate.execute(txStatus -> {
+ Long newMpsId = createMpsForSaleOrderItem(saleOrder, item);
+ if (newMpsId != null) {
+ // 鏇存柊閿�鍞鍗曟槑缁嗙殑 MPS 鍏宠仈
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setMpsId(newMpsId));
+ }
+ return newMpsId;
+ });
if (mpsId != null) {
mpsCount++;
- // 鏇存柊閿�鍞鍗曟槑缁嗙殑 MPS 鍏宠仈
- saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
- .setId(item.getId())
- .setMpsId(mpsId));
}
} catch (Exception e) {
log.error("[createMpsForSaleOrder] 鍒涘缓 MPS 澶辫触锛宻aleOrderItemId={}", item.getId(), e);
@@ -482,4 +506,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3