20250507

src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java

@@ -343,24 +343,26 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
             BigDecimal DLPrintRate = calculation.getLaborPrintRate();
             BigDecimal FOHPrintRate = calculation.getMachPrintRate();
             BigDecimal VOHPrintRate = calculation.getManuPrintRate();
-            BigDecimal DL = strategy.computeDL(
-                    antennaUsage, bondingYield, convertingYield, DLBeforeFeeRate,
-                    DLBondingManHour, DLAfterFeeRate,DLParisBondingManHour,DLParisFeeRate,
-                    DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
-                    DLPrintRate);
-            BigDecimal FOH = strategy.computeFOH(
-                    antennaUsage, bondingYield, convertingYield, FOHBeforeFeeRate,
-                    DLBondingManHour, FOHAfterFeeRate,DLParisBondingManHour,VOHParisFeeRate,
-                    DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
-                    FOHPrintRate);
-            BigDecimal VOH = strategy.computeVOH(
-                    antennaUsage, bondingYield, convertingYield, VOHBeforeFeeRate,
-                    DLBondingManHour, VOHAfterFeeRate,DLParisBondingManHour,FOHParisFeeRate,
-                    DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
-                    VOHPrintRate);
-            labourCost = DL;
-            machineCost = FOH;
-            manufactureCost = VOH;
+            if (Objects.nonNull(strategy)){
+                BigDecimal DL = strategy.computeDL(
+                        antennaUsage, bondingYield, convertingYield, DLBeforeFeeRate,
+                        DLBondingManHour, DLAfterFeeRate,DLParisBondingManHour,DLParisFeeRate,
+                        DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
+                        DLPrintRate);
+                BigDecimal FOH = strategy.computeFOH(
+                        antennaUsage, bondingYield, convertingYield, FOHBeforeFeeRate,
+                        DLBondingManHour, FOHAfterFeeRate,DLParisBondingManHour,VOHParisFeeRate,
+                        DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
+                        FOHPrintRate);
+                BigDecimal VOH = strategy.computeVOH(
+                        antennaUsage, bondingYield, convertingYield, VOHBeforeFeeRate,
+                        DLBondingManHour, VOHAfterFeeRate,DLParisBondingManHour,FOHParisFeeRate,
+                        DLConvertingManHour, convertingRate, DLAfterConvertingManHour, DLPrintConvertingManHour,
+                        VOHPrintRate);
+                labourCost = DL;
+                machineCost = FOH;
+                manufactureCost = VOH;
+            }
         }else {
             // 其他一律按照UFIDA计算
             Map<Long, List<QuoteDetailRouting>> routingMap = new HashMap<>();