From f6d0b2fadacd040cde009abcdecee9816f13d3bc Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 4 Jul 2025 15:20:11 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisTmsCostFeeServiceImpl.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 b6c5db4a9..cf355e3be 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
@@ -1030,11 +1030,15 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
     public void mergeCostFeeByBillCode(String billCode) throws EmisBizError {
 
         String mainBillCode=billCode;
+
         // 判断是虚拟单还是主单
         EmisWaybill emisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(billCode);
+        EmisWaybill mainEmisWaybill=emisWaybill;
         // 如果是虚拟单则使用主单号
         if("1".equals(emisWaybill.getBlVirtual()) ){
             mainBillCode=emisWaybill.getMasterBillCode();
+            mainEmisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(mainBillCode);
+
         }
 
         EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode);
@@ -1042,10 +1046,10 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
             // 获取成本数据
             emisTmsCostProfit = new EmisTmsCostProfit();
             emisTmsCostProfit.setBillCode(mainBillCode);
-            emisTmsCostProfit.setBillFee(emisWaybill.getFreight());
-            emisTmsCostProfit.setStandardFee(emisWaybill.getRealFee());
+            emisTmsCostProfit.setBillFee(mainEmisWaybill.getFreight());
+            emisTmsCostProfit.setStandardFee(mainEmisWaybill.getRealFee());
             emisTmsCostProfit.setCostFee(BigDecimal.ZERO);
-            emisTmsCostProfit.setBillProfit(emisWaybill.getFreight());
+            emisTmsCostProfit.setBillProfit(mainEmisWaybill.getFreight());
 
             emisTmsCostProfitMapper.insertEmisTmsCostProfit(emisTmsCostProfit);
         }