From 8dc42b021c2b88c877d997ddfd95cf1ad7117c1c Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 17 Jul 2024 17:05:15 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisWaybillServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index bb7537e13..68bccfdbb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1634,8 +1634,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb continue; } - - // 判断是否要计算报关费 只有一般贸易报关需要收取报关费 // 2002-报关费 3-一般报关 if( "2002".equals(quoteItem.getFeeType()) ){ @@ -1668,6 +1666,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType()); feeItem.setFeeName(feeName); + // 币种 + feeItem.setCurrency(quoteItem.getCurrency()); + feeItem.setQuoteId(quoteItem.getQuoteId()); feeItem.setExprId(exprItem.getId()); @@ -1679,7 +1680,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight())); feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight())); - String calcExprStr=calcExp.replaceAll("w",emisWaybill.getSettlementWeight().toString()) .replaceAll("s",exprItem.getInitialWeight().toString()) .replaceAll("d",exprItem.getAdditionalWeight().toString()); @@ -1708,7 +1708,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb break; } - } } // 体积计费 @@ -1726,6 +1725,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType()); feeItem.setFeeName(feeName); + // 币种 + feeItem.setCurrency(quoteItem.getCurrency()); + feeItem.setQuoteId(quoteItem.getQuoteId()); feeItem.setExprId(exprItem.getId()); @@ -1737,7 +1739,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight())); feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight())); - String exprStr = exprItem.getCalculateExpression(); String calcExprStr=exprStr.replaceAll("w",emisWaybill.getTotalVolume().toString()); log.info("计算公式:"+calcExprStr+",体积:"+emisWaybill.getTotalVolume()); @@ -1753,8 +1754,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb feeItem.setRemark(feeItem.getCalcExp()); feeItem.setBlAutoGen("1"); - - break; } }