From a2847b96203e0a2636d4753cd16517d107ecb14b Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 9 Sep 2024 14:29:39 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B74?=
 =?UTF-8?q?=E4=B8=AA=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=20=E6=A0=B9=E6=8D=AE=E4=B8=87?=
 =?UTF-8?q?=E6=9D=90=E6=8F=90=E4=BE=9B=E7=9A=84=E6=96=B0=E7=9A=84=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=E6=A8=A1=E6=9D=BF3=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF3excel=E6=96=87=E4=BB=B6=E3=80=81=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E5=AE=9E=E7=8E=B0=E7=B1=BB=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AF=B9=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF3=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E5=89=8D=E7=AB=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF3=E4=B9=8B=E5=89=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=89=E6=8B=A9=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=AF?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AFRMB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalesEstimateServiceImpl.java        |  54 +++++++++++++++---
 .../static/attachments/客户报价3.xlsx     | Bin 22137 -> 22196 bytes
 .../system/customerQuote/customerQuote.html   |  13 ++---
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
index b32ee762..26c15b03 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.redis.RedisCache;
@@ -93,8 +94,28 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         salesEstimate.setEstimateStatus("0");
         //设置默认值为RMB
         salesEstimate.setCommonCurrency("1");
+
         List<SalesEstimateDetail> salesEstimateDetailList = salesEstimate.getSalesEstimateDetailList();
+
         if (salesEstimateDetailList != null && salesEstimateDetailList.size() > 0) {
+            // 确保 getMaterialNum 返回类型为 Long 或 long
+            long enterpriseSum = salesEstimateDetailList.stream()
+                    .filter(detail->detail.getMaterialNum() != null) // 过滤掉 null 元素
+                    .mapToLong(SalesEstimateDetail::getMaterialNum)
+                    .sum();
+
+            salesEstimate.setEnterpriseSum(enterpriseSum);
+            salesEstimate.setMaterialSum((long) salesEstimateDetailList.size());
+
+            //计算不含税单价人民币
+            //计算不含税单价美元
+            //计算含税单价人民币
+            //计算含税单价美元
+            //计算不含税总价人民币
+            //计算不含税总价美元
+            //计算含税总价人民币
+            //计算含税总价美元
+
             for (SalesEstimateDetail salesEstimateDetail : salesEstimateDetailList) {
                 salesEstimateDetail.setSalesEstimateCode(salesEstimateCode);
 
@@ -286,7 +307,13 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
 3、不含税经营成本(RMB)=(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
 4、含税经营成本(RMB)=(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
 5、不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税总经营成本+(该料号的BOM物料总不含税采购成本/总不含税物料成本)*总不含税经营成本
+新版：不含税料号估价成本:该料号的BOM物料总不含税采购成本+不含税运输成本+不含税服务成本+不含税开发成本+(该料号的BOM物料总不含税采购成本/总物料不含税成本)*总经营不含税成
+
+
 6、含税料号估价成本:该料号的BOM物料总含税采购成本+含税总经营成本+(该料号的BOM物料总含税采购成本/总含税物料成本)*总含税经营成本
+新版：含税料号估价成本:该料号的BOM物料总含税采购成本+含税运输成本+含税服务成本+含税开发成本+(该料号的BOM物料总含税采购成本/总物料含税成本)*总经营含税成本
+
+
 7、不含税单价(RMB):该料号不含税估价成本/(1-利润率)
 8、含税单价(RMB)=该料号含税估价成本/(1-利润率)
 9、不含税总价(RMB)=不含税单价(RMB)*数量
@@ -340,6 +367,11 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
             BigDecimal noTaxBusinessCosts = salesEstimateDetail.getNoTaxBusinessCosts(); // 获取不含税的业务成本
             BigDecimal noTaxManagesCosts = salesEstimateDetail.getNoTaxManagesCosts(); // 获取不含税的管理成本
             BigDecimal noTaxMaterialCosts = salesEstimateDetail.getNoTaxMaterialCosts(); // 获取不含税的物料成本
+
+            BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
+            BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
+            BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
+
             BigDecimal profitRate = salesEstimateDetail.getProfitRate().divide(BigDecimal.valueOf(100)); // 获取利润率并转换为小数形式
             Long materialNum = salesEstimateDetail.getMaterialNum(); // 获取物料数量
 
@@ -367,10 +399,10 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
                     .setScale(2, RoundingMode.HALF_UP);
 
             // 计算不含税料号估价成本，并保留两位小数
-            BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noAllTaxOperatingCosts, noTaxMaterialCosts)
+            BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts,noAllTaxOperatingCosts, noTaxMaterialCosts)
                     .setScale(2, RoundingMode.HALF_UP);
             // 计算含税料号估价成本，并保留两位小数
-            BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb, allTaxOperatingCosts, taxMaterialCosts)
+            BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb,noTaxShippingCosts,noTaxServiceCosts,noTaxDevelopmentCosts, allTaxOperatingCosts, taxMaterialCosts)
                     .setScale(2, RoundingMode.HALF_UP);
 
             // 计算不含税单价(RMB)，并保留两位小数
@@ -498,16 +530,24 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
                 .multiply(allTaxOperatingCosts);
     }
 
-    // 计算不含税料号估价成本
-    private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noAllTaxOperatingCosts, BigDecimal noTaxMaterialCosts) {
-        return totalNoTaxPurchaseRmb.add(noAllTaxOperatingCosts)
+    // 计算不含税料号估价成本                BigDecimal noTaxShippingCosts = salesEstimateDetail.getNoTaxShippingCosts(); //不含税运输成本
+    //            BigDecimal noTaxServiceCosts = salesEstimateDetail.getNoTaxServiceCosts(); //不含税服务成本
+    //            BigDecimal noTaxDevelopmentCosts = salesEstimateDetail.getNoTaxDevelopCosts();//不含税开发成本
+    private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxShippingCosts  ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal noAllTaxOperatingCosts,BigDecimal noTaxMaterialCosts) {
+        return totalNoTaxPurchaseRmb
+                .add(noTaxShippingCosts)
+                .add(noTaxServiceCosts)
+                .add(noTaxDevelopmentCosts)
                 .add(totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
                         .multiply(noAllTaxOperatingCosts));
     }
 
     // 计算含税料号估价成本
-    private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
-        return totalTaxPurchaseRmb.add(allTaxOperatingCosts)
+    private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal noTaxShippingCosts  ,BigDecimal noTaxServiceCosts,BigDecimal noTaxDevelopmentCosts ,BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
+        return totalTaxPurchaseRmb
+                .add(noTaxShippingCosts)
+                .add(noTaxServiceCosts)
+                .add(noTaxDevelopmentCosts)
                 .add(totalTaxPurchaseRmb.divide(taxMaterialCosts, 2, RoundingMode.HALF_UP)
                         .multiply(allTaxOperatingCosts));
     }
diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx b/ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx
index 4fd9c8b79d312724fa9a8b2ee685a3cd4a3c7a5a..eb838e98a08f4e3fd8430c1421ff3923ea4b67cf 100644
GIT binary patch
delta 9340
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

delta 9289
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

diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
index ba6cd6df..f1573e14 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
@@ -71,17 +71,16 @@
                     <i class="fa fa-download"></i> 导出
                 </a>
                 <a class="btn btn-warning" onclick="exportCustomerQuoteOne()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteOne">
-                    <i class="fa fa-download"></i> 导出客户报价1
+                    <i class="fa fa-download"></i> 导出Vantritek-RMB
                 </a>
                 <a class="btn btn-warning" onclick="exportCustomerQuoteTwo()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteTwo">
-                    <i class="fa fa-download"></i> 导出客户报价2
+                    <i class="fa fa-download"></i> 导出Vantritek-美元
                 </a>
-
                 <a class="btn btn-warning" onclick="exportCustomerQuoteThree()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteThree">
-                    <i class="fa fa-download"></i> 导出客户报价3
+                    <i class="fa fa-download"></i> 导出Infinity-RMB
                 </a>
                 <a class="btn btn-warning" onclick="exportCustomerQuoteFour()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteFour">
-                    <i class="fa fa-download"></i> 导出客户报价4
+                    <i class="fa fa-download"></i> 导出Infinity-美元
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
@@ -410,7 +409,7 @@
                     // 检查是否已审核
                     if (row.auditStatus === AUDIT_STATUS_APPROVED) {
 
-                        if (row.commonCurrency === '2'){
+                        if (row.commonCurrency === '1'){
                             // 使用 $.modal.confirm 显示确认对话框
                             $.modal.confirm("确定导出这条数据的客户报价吗？", function() {
                                 // 如果用户点击确定，继续导出
@@ -419,7 +418,7 @@
                                 $('#bootstrap-table').bootstrapTable('refresh'); // 刷新表格
                             });
                         }else {
-                            showWarning("请选择报价币种为美元的数据进行导出");
+                            showWarning("请选择报价币种为RMB的数据进行导出");
                         }
                     } else {
                         showWarning("请先审核");