diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index 7cf979c33..806dc730c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -1289,13 +1289,14 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT } // 计算运单利润:运单费用 - 运输成本 - 理赔金额 - 折让金额 - 抵扣金额 - 其他金额 - BigDecimal billProfit = emisTmsCostProfit.getBillFee() + BigDecimal billProfit = mainEmisWaybill.getFreight() .subtract(updProfit.getCostFee()) .subtract(updProfit.getSatisfyMoney() != null ? updProfit.getSatisfyMoney() : BigDecimal.ZERO) .subtract(updProfit.getAllowanceMoney() != null ? updProfit.getAllowanceMoney() : BigDecimal.ZERO) .subtract(updProfit.getDeductionMoney() != null ? updProfit.getDeductionMoney() : BigDecimal.ZERO) .subtract(updProfit.getOtherMoney() != null ? updProfit.getOtherMoney() : BigDecimal.ZERO); updProfit.setBillProfit(billProfit); + updProfit.setBillFee(mainEmisWaybill.getFreight()); emisTmsCostProfitMapper.updateEmisTmsCostProfit(updProfit); }