|
|
@ -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; |
|
|
|