From 3fcae709ef631d158157473ae6ccbf9b9c8d87a3 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 19 Jun 2025 15:30:14 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java  | 2 ++
 .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java   | 7 +++++++
 .../main/resources/mapper/EmisTmsCostFeeSplitMapper.xml    | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
index 77d4b6d53..03c2ecb6b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java
@@ -80,6 +80,8 @@ public interface EmisTmsCostFeeSplitMapper extends BaseMapper<EmisTmsCostFeeSpli
 
     public int deleteEmisTmsCostFeeSplitByCostNo(String costNo);
 
+    public int deleteEmisTmsCostFeeSplitByBillCode(String BillCode);
+
     /**
      * 批量删除
      * 
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 82e136bdc..b08499ff5 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
@@ -285,6 +285,9 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
                 splitItem.setFeeType(feeItem.getFeeType());
                 splitItem.setSplitType(oldCostFee.getSplitType());
 
+                // 外币转换成人民币
+//                String currency=feeItem.getCurrency();
+
                 BigDecimal splitCostFee = BigDecimal.ZERO;
                 BigDecimal splitRate = BigDecimal.ZERO;
                 // 按重量分摊
@@ -344,6 +347,10 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
     @Override
     @Transactional
     public int reCalcCostFeeByBillCode(String billCode) throws EmisBizError {
+
+        // 根据运单号删除该运单计算的费用
+        emisTmsCostFeeSplitMapper.deleteEmisTmsCostFeeSplitByBillCode(billCode);
+
         // 根据运单搜索成本费用
         List<EmisTmsCostFeeRel> listBillCodeRel=emisTmsCostFeeRelMapper.selectEmisTmsCostFeeRelListByBillCode(billCode);
         if(!CollectionUtil.isEmpty(listBillCodeRel)){
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
index 80aa86bad..af3867e7e 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
@@ -178,8 +178,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where del_flag='0' and a.bill_code = #{billCode}
     </select>
 
+    <delete id="deleteEmisTmsCostFeeSplitByBillCode" parameterType="String">
+         update emis_tms_cost_fee_split set del_flag='1' where del_flag='0' and bill_code = #{billCode}
+    </delete>
+
     <delete id="deleteEmisTmsCostFeeSplitByCostNo" parameterType="String">
-         update emis_tms_cost_fee_split set del_flag='1' where cost_no = #{costNo}
+         update emis_tms_cost_fee_split set del_flag='1' where del_flag='0' and cost_no = #{costNo}
     </delete>
 
     <delete id="deleteEmisTmsCostFeeSplitById" parameterType="Long">