aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-17 17:05:15 +08:00
parent 741e6a4250
commit 8dc42b021c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1634,8 +1634,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
continue; continue;
} }
// 判断是否要计算报关费 只有一般贸易报关需要收取报关费 // 判断是否要计算报关费 只有一般贸易报关需要收取报关费
// 2002-报关费 3-一般报关 // 2002-报关费 3-一般报关
if( "2002".equals(quoteItem.getFeeType()) ){ 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()); String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType());
feeItem.setFeeName(feeName); feeItem.setFeeName(feeName);
// 币种
feeItem.setCurrency(quoteItem.getCurrency());
feeItem.setQuoteId(quoteItem.getQuoteId()); feeItem.setQuoteId(quoteItem.getQuoteId());
feeItem.setExprId(exprItem.getId()); feeItem.setExprId(exprItem.getId());
@ -1679,7 +1680,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight())); feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight()));
feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight())); feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight()));
String calcExprStr=calcExp.replaceAll("w",emisWaybill.getSettlementWeight().toString()) String calcExprStr=calcExp.replaceAll("w",emisWaybill.getSettlementWeight().toString())
.replaceAll("s",exprItem.getInitialWeight().toString()) .replaceAll("s",exprItem.getInitialWeight().toString())
.replaceAll("d",exprItem.getAdditionalWeight().toString()); .replaceAll("d",exprItem.getAdditionalWeight().toString());
@ -1708,7 +1708,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
break; break;
} }
} }
} }
// 体积计费 // 体积计费
@ -1726,6 +1725,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType()); String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType());
feeItem.setFeeName(feeName); feeItem.setFeeName(feeName);
// 币种
feeItem.setCurrency(quoteItem.getCurrency());
feeItem.setQuoteId(quoteItem.getQuoteId()); feeItem.setQuoteId(quoteItem.getQuoteId());
feeItem.setExprId(exprItem.getId()); feeItem.setExprId(exprItem.getId());
@ -1737,7 +1739,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight())); feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight()));
feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight())); feeItem.setInitialWeightFee(BigDecimal.valueOf(exprItem.getInitialWeight()));
String exprStr = exprItem.getCalculateExpression(); String exprStr = exprItem.getCalculateExpression();
String calcExprStr=exprStr.replaceAll("w",emisWaybill.getTotalVolume().toString()); String calcExprStr=exprStr.replaceAll("w",emisWaybill.getTotalVolume().toString());
log.info("计算公式:"+calcExprStr+",体积:"+emisWaybill.getTotalVolume()); log.info("计算公式:"+calcExprStr+",体积:"+emisWaybill.getTotalVolume());
@ -1753,8 +1754,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
feeItem.setRemark(feeItem.getCalcExp()); feeItem.setRemark(feeItem.getCalcExp());
feeItem.setBlAutoGen("1"); feeItem.setBlAutoGen("1");
break; break;
} }
} }