From 87a13410563ddd253a454561274f18fa5e3af83d Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 10 Jan 2025 15:04:26 +0800
Subject: [PATCH] 2025-1-10

---
 .../com/spring/modules/quote/entity/QuoteDetail.java | 12 ++++++------
 .../quote/service/impl/QuoteDetailServiceImpl.java   |  6 ++++++
 .../modules/quote/service/impl/QuoteServiceImpl.java |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
index db00d28e..649cfa55 100644
--- a/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
+++ b/src/main/java/com/spring/modules/quote/entity/QuoteDetail.java
@@ -123,17 +123,17 @@ public class QuoteDetail {
 
     private BigDecimal quoteTotalCost;
 
-    private BigDecimal quoteProfitRate;
+    private BigDecimal quoteProfitRate;// VA
 
-    private BigDecimal quoteProfitAmount;
+    private BigDecimal quoteProfitAmount;//Contribution
 
     private BigDecimal quoteTotalPrice;
 
     private BigDecimal quoteUnitPrice;
 
-    private BigDecimal quoteTaxRate;
+    private BigDecimal quoteTaxRate;// Margin
 
-    private BigDecimal quoteTaxTotalPrice;
+    private BigDecimal quoteTaxTotalPrice; //Price ¥(ex VAT)
 
     private BigDecimal quoteTaxUnitPrice;
 
@@ -149,11 +149,11 @@ public class QuoteDetail {
 
     private BigDecimal currencyTotalCost1;
 
-    private BigDecimal currencyTotalCost2;
+    private BigDecimal currencyTotalCost2;// 被当作含税单价
 
     private BigDecimal quoteCurrencyTotalCost1;
 
-    private BigDecimal quoteCurrencyTotalCost2;// 被当作含税单价
+    private BigDecimal quoteCurrencyTotalCost2;
 
     private BigDecimal testCost;
 
diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
index f20a876b..54ea151d 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -310,6 +310,9 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 packCost = num1.add(num2);
             }
         }
+        if (otherPackCost.isPresent()){
+            packCost = packCost.add(otherPackCost.get().getNumValue());
+        }
         return packCost;
     }
 
@@ -352,6 +355,9 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 shippingCost = shipCost.get().getNumValue().divide(deliverQuantity.get().getNumValue());
             }
         }
+        if (otherShipCost.isPresent()){
+            shippingCost = shippingCost.add(otherShipCost.get().getNumValue());
+        }
         return shippingCost;
     }
 
diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
index cde88bff..7370f1f0 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
@@ -301,7 +301,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setAdjustElseCost(BigDecimal.ZERO);
             detail.setTestCost(BigDecimal.ZERO);
             detail.setAdjustTestCost(BigDecimal.ZERO);
-            detail.setCalculatedItems("工具,测试,其他,包装&运输");
+            detail.setCalculatedItems("工具,测试,其他,包装,运输");
             detail.setMoq("");
 
             // 复制detail到Group