From 972aa789da999bf3f4acb8e8afbca225c9181c47 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Jun 2025 20:45:26 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisTmsCostFeeServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 30d4aed1a..99aa6b562 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
@@ -716,9 +716,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
     }
 
 
-
-
-
     /**
      * 合并成本费用
      * @param billCode
@@ -729,10 +726,15 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
     @Transactional
     public int mergeCostFeeByBillCode(String billCode) throws EmisBizError {
 
+        String mainBillCode=billCode;
         // 判断是虚拟单还是主单
         EmisWaybill emisWaybill=emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
+        // 如果是虚拟单则使用主单号
+        if("1".equals(emisWaybill.getBlVirtual()) ){
+            mainBillCode=emisWaybill.getMasterBillCode();
+        }
 
-        EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(billCode);
+        EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode);
         if(emisTmsCostProfit==null){
             // 获取成本数据
             emisTmsCostProfit = new EmisTmsCostProfit();