From 0ea9e7b6f397f7a8c572653f46a82394b22b54dc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Apr 2026 15:57:10 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-13=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E3=80=90=E5=88=87=E6=8D=A2=E7=89=88=E6=9C=AC=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=B0=86=E2=80=9D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=88=90=E6=9C=AC=E2=80=9C=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=A4=96=E6=89=A7=E8=A1=8C=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=95=BF=E4=BA=8B=E5=8A=A1=E9=94=81=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B/=E7=BC=96=E8=BE=91=E6=9D=A1=E7=9B=AE?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QuoteDetailBomTreeServiceImpl.java   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
index a20585b1..4d13c83a 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
@@ -403,22 +403,21 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
                     doSaveBomDataRecursive(finalNodeData, finalDetail, 0L);
                 }
             }
-
-            // 2. 重新计算成本 (如果开启)
-            // 将其放在同一个事务中，如果计算失败，BOM 切换也会一并回滚，保证数据一致性
-            if (Boolean.TRUE.equals(tree.getRecalculateCost()) && finalDetail != null) {
-                log.info("[BOM_SWITCH] Recalculate cost is enabled, executing cost calculation for QuoteDetailId: {}", finalDetail.getId());
-                try {
-                    quoteDetailService.queryQuoteDetailCost(finalDetail);
-                    log.info("[BOM_SWITCH] Cost calculation completed successfully for QuoteDetailId: {}", finalDetail.getId());
-                } catch (Exception e) {
-                    log.error("[BOM_SWITCH] Cost calculation failed for QuoteDetailId: {}, Error: {}", finalDetail.getId(), e.getMessage(), e);
-                    // 抛出 RuntimeException 以触发 transactionTemplate 回滚
-                    throw new RuntimeException("成本计算失败: " + e.getMessage());
-                }
-            }
             return null;
         });
+
+        // 2. 重新计算成本 (如果开启)
+        // 移出事务外执行，避免长事务锁表导致其他用户无法查看/编辑条目明细
+        if (Boolean.TRUE.equals(tree.getRecalculateCost()) && finalDetail != null) {
+            log.info("[BOM_SWITCH] Recalculate cost is enabled, executing cost calculation for QuoteDetailId: {}", finalDetail.getId());
+            try {
+                quoteDetailService.queryQuoteDetailCost(finalDetail);
+                log.info("[BOM_SWITCH] Cost calculation completed successfully for QuoteDetailId: {}", finalDetail.getId());
+            } catch (Exception e) {
+                log.error("[BOM_SWITCH] Cost calculation failed for QuoteDetailId: {}, Error: {}", finalDetail.getId(), e.getMessage(), e);
+                throw new RuntimeException("BOM切换成功，但成本重新计算失败: " + e.getMessage());
+            }
+        }
     }
 
     // =========================================================================