From d9ec87f792942befb286b7425222ac08ba5af665 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Jun 2025 22:47:19 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java | 1 +
 .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java     | 5 ++++-
 .../src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java
index 43f3d3c96..e16c1109e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeSplit.java
@@ -88,6 +88,7 @@ public class EmisTmsCostFeeSplit extends BaseEntity
     private String blSub;
 
     // 扩展字段: 费用信息
+    private String supplierName;
     private EmisTmsCostFeeFeeitem feeItem;
     private EmisTmsCostFee costFeeDetail;
     private EmisWaybill waybillDetail;
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 ff597b798..4ee10d33a 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
@@ -742,9 +742,12 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         if(emisTmsCostProfit==null){
             // 获取成本数据
             emisTmsCostProfit = new EmisTmsCostProfit();
-            emisTmsCostProfit.setBillCode(emisWaybill.getBillCode());
+            emisTmsCostProfit.setBillCode(mainBillCode);
             emisTmsCostProfit.setBillFee(emisWaybill.getFreight());
             emisTmsCostProfit.setStandardFee(emisWaybill.getRealFee());
+            emisTmsCostProfit.setCostFee(BigDecimal.ZERO);
+            emisTmsCostProfit.setBillProfit(emisWaybill.getFreight());
+
             emisTmsCostProfitMapper.insertEmisTmsCostProfit(emisTmsCostProfit);
         }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
index 9a635a5bf..9e1a1225d 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="blVirtual"    column="bl_virtual"    />
         <result property="blSub"    column="bl_sub"    />
 
-        <association property="supplierName"    column="supplier_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSupplierNameByCode"/>
+        <association property="supplierName"  column="supplier_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSupplierNameByCode"/>
 
         <association property="feeItem"
                      column="fee_item_id"