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-04-29 14:36:41 +08:00
parent 75d33305fd
commit c047b7ddee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,9 +404,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
feeItem.setQuoteId(quoteItem.getQuoteId()); feeItem.setQuoteId(quoteItem.getQuoteId());
feeItem.setExprId(exprItem.getId()); feeItem.setExprId(exprItem.getId());
String exprStr = exprItem.getCalculateExpression(); String calcExp = exprItem.getCalculateExpression();
feeItem.setCalcExp(calcExp);
feeItem.setAddWeightPrice(BigDecimal.valueOf(exprItem.getAdditionalWeight()));
String calcExprStr=exprStr.replaceAll("w",emisWaybill.getSettlementWeight().toString()); String calcExprStr=calcExp.replaceAll("w",emisWaybill.getSettlementWeight().toString());
log.info("计算公式:"+calcExprStr+",重量:"+emisWaybill.getSettlementWeight()); log.info("计算公式:"+calcExprStr+",重量:"+emisWaybill.getSettlementWeight());
double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
feeItem.setFee(BigDecimal.valueOf(fee)); feeItem.setFee(BigDecimal.valueOf(fee));