From 6f440759d5d10fc9c979cc6a8fdfa7fd91d28935 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 17 Mar 2026 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-17=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E6=9D=90=E6=96=99=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E6=8D=9F=E8=80=97=E7=8E=87=E4=B8=BA100=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E8=AE=A1=E7=AE=97=EF=BC=8C=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=89=AF=E7=8E=87=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
index d9f1fec8..cd589384 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
@@ -148,16 +148,21 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
         BigDecimal shrinkageFactor = quoteDetailBom.getShrinkageFactor();
         // 5、报价数量
         BigDecimal qty = detail.getQty();
+        if (unitPrice == null || componentScrap == null || qtyPerAssembly == null || shrinkageFactor == null || qty == null) {
+            return BigDecimal.ZERO;
+        }
         // 6 计算所需数量
         // 调机单位用量
         if (qty.compareTo(BigDecimal.ZERO) == 0) {
             return BigDecimal.ZERO;
         }
+        // 损耗率为100%时良率为0，无法计算，直接返回0
+        BigDecimal yieldRate = BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 16, RoundingMode.HALF_UP));
+        if (yieldRate.compareTo(BigDecimal.ZERO) == 0) {
+            return BigDecimal.ZERO;
+        }
         BigDecimal componentUnitScrap = componentScrap.divide(qty, 16, RoundingMode.HALF_UP);
-        BigDecimal needQty =
-                qtyPerAssembly
-                        .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 16, RoundingMode.HALF_UP)), 16, RoundingMode.HALF_UP)
-                        .add(componentUnitScrap);
+        BigDecimal needQty = qtyPerAssembly.divide(yieldRate, 16, RoundingMode.HALF_UP).add(componentUnitScrap);
         // (调机用量/数量+单位用量/1-损耗率)*单位成本
         return needQty.multiply(unitPrice).setScale(6, RoundingMode.HALF_UP);
     }
@@ -174,17 +179,21 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
         BigDecimal shrinkageFactor = quoteDetailBom.getShrinkageFactor();
         // 5、报价数量
         BigDecimal qty = detail.getQty();
+        if (actualPrice == null || componentScrap == null || qtyPerAssembly == null || shrinkageFactor == null || qty == null) {
+            return BigDecimal.ZERO;
+        }
         // 6 计算所需数量
         // 调机单位用量
         if (qty.compareTo(BigDecimal.ZERO) == 0) {
             return BigDecimal.ZERO;
         }
+        // 损耗率为100%时良率为0，无法计算，直接返回0
+        BigDecimal yieldRate = BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+        if (yieldRate.compareTo(BigDecimal.ZERO) == 0) {
+            return BigDecimal.ZERO;
+        }
         BigDecimal componentUnitScrap = componentScrap.divide(qty, 16, RoundingMode.HALF_UP);
-        BigDecimal needQty =
-                qtyPerAssembly
-                        .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP)
-                        .add(componentUnitScrap);
-
+        BigDecimal needQty = qtyPerAssembly.divide(yieldRate, 4, RoundingMode.HALF_UP).add(componentUnitScrap);
         return needQty.multiply(actualPrice).setScale(6, RoundingMode.HALF_UP);
     }
 
@@ -200,16 +209,21 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
         BigDecimal shrinkageFactor = quoteDetailBom.getShrinkageFactor();
         // 5、报价数量
         BigDecimal qty = detail.getQty();
+        if (quotePrice == null || componentScrap == null || qtyPerAssembly == null || shrinkageFactor == null || qty == null) {
+            return BigDecimal.ZERO;
+        }
         // 6 计算所需数量
         // 调机单位用量
         if (qty.compareTo(BigDecimal.ZERO) == 0) {
             return BigDecimal.ZERO;
         }
+        // 损耗率为100%时良率为0，无法计算，直接返回0
+        BigDecimal yieldRate = BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+        if (yieldRate.compareTo(BigDecimal.ZERO) == 0) {
+            return BigDecimal.ZERO;
+        }
         BigDecimal componentUnitScrap = componentScrap.divide(qty, 16, RoundingMode.HALF_UP);
-        BigDecimal needQty =
-                qtyPerAssembly
-                        .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP)
-                        .add(componentUnitScrap);
+        BigDecimal needQty = qtyPerAssembly.divide(yieldRate, 4, RoundingMode.HALF_UP).add(componentUnitScrap);
         return needQty.multiply(quotePrice).setScale(6, RoundingMode.HALF_UP);
     }