Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java

@@ -231,6 +231,9 @@ public class QuoteDetail {
     @TableField(exist = false)
     private Boolean authFlag;
 
+    @TableField(exist = false)
+    private BigDecimal totalCostUSD;
+
     @TableField(exist = false)
     private List<PropertyModelDetail> list;
 }

src/main/java/com/xujie/sys/modules/quote/entity/QuoteGroupDetail.java

@@ -228,6 +228,8 @@ public class QuoteGroupDetail {
     private BigDecimal weighted2;
     @TableField(exist = false)
     private Integer decimalPlace;
+    @TableField(exist = false)
+    private BigDecimal totalCostUSD;
 
     @TableField(exist = false)
     private List<PropertyModelDetail> list;

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

@@ -343,6 +343,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
             BigDecimal DLPrintRate = calculation.getLaborPrintRate();
             BigDecimal FOHPrintRate = calculation.getMachPrintRate();
             BigDecimal VOHPrintRate = calculation.getManuPrintRate();
+            if (Objects.nonNull(strategy)){
                 BigDecimal DL = strategy.computeDL(
                         antennaUsage, bondingYield, convertingYield, DLBeforeFeeRate,
                         DLBondingManHour, DLAfterFeeRate,DLParisBondingManHour,DLParisFeeRate,
@@ -361,6 +362,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 labourCost = DL;
                 machineCost = FOH;
                 manufactureCost = VOH;
+            }
         }else {
             // 其他一律按照UFIDA计算
             Map<Long, List<QuoteDetailRouting>> routingMap = new HashMap<>();

src/main/resources/mapper/quote/QuoteDetailMapper.xml

@@ -74,6 +74,17 @@
                qd.type,
                qd.quote_group_detail_id,
                qd.cost_model,
+               CASE
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END)
+                   ELSE NULL
+                   END AS totalCostUSD,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
@@ -550,6 +561,17 @@
                qd.type,
                qd.quote_group_detail_id,
                qd.cost_model,
+               CASE
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END)
+                   ELSE NULL
+                   END AS totalCostUSD,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR

src/main/resources/mapper/quote/QuoteGroupDetailMapper.xml

@@ -74,6 +74,17 @@
                qd.type,
                qd.current_quote_detail_item_no,
                qd.cost_model,
+               CASE
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END)
+                   ELSE NULL
+                   END AS totalCostUSD,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR