From 49b2d6a87d8a7e3b1a5ec6d02b8d2a8d4ef08346 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 28 Jan 2026 16:31:57 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=88=A9=E6=B6=A6=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=9B=B4=E6=96=B0=E5=88=A9=E6=B6=A6=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=8F=96=E6=9C=80=E6=96=B0=E7=9A=84=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
 
     }