From c047b7ddeed48573d483279d449c02fec677f444 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 29 Apr 2024 14:36:41 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 27f00407f..236a54b3f 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 @@ -404,9 +404,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb feeItem.setQuoteId(quoteItem.getQuoteId()); 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()); double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); feeItem.setFee(BigDecimal.valueOf(fee));