From 6165f25b5e2403eaffa3bda24ba7083038a8b571 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 3 Jan 2025 11:04:05 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=9A=84?=
 =?UTF-8?q?4=E4=B8=AA=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B8=81=E7=A7=8D=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E7=9A=84=E5=80=BC=E6=9D=A5=E8=87=AA=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=8A=A5=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysCustomerQuoteServiceImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
index 3d44d48e..1f0043b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
@@ -535,7 +535,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
                 exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
-                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
+                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerQuote, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
             }
 
@@ -600,7 +600,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
                 exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
-                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
+                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerQuote, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
             }
 
@@ -663,7 +663,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
                 exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
-                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
+                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerQuote, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
             }
 
@@ -733,7 +733,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
                 exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
-                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
+                setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerQuote, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
             }
 
@@ -749,8 +749,8 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
     }
 
     //区分不同币种的金额
-    private void setMaterialPrice(ExportCustomerQuoteChildVo vo, SysCustomerVo sysCustomerVo, SysCustomerQuoteChild child) {
-        if (RMB.equals(sysCustomerVo.getCommonCurrency())) {
+    private void setMaterialPrice(ExportCustomerQuoteChildVo vo, SysCustomerQuote sysCustomerQuote, SysCustomerQuoteChild child) {
+        if (RMB.equals(sysCustomerQuote.getCommonCurrency())) {
             // RMB
             BigDecimal noTax = child.getMaterialNoRmb() != null ? child.getMaterialNoRmb() : BigDecimal.ZERO;
             BigDecimal tax = child.getMaterialRmb() != null ? child.getMaterialRmb() : BigDecimal.ZERO;