From b4beac8c02acc6f887e61afcd597bfbd6f595dc2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 18 Feb 2025 17:31:52 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsCostFeeServiceImpl.java       | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 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 b8281560b..70e3cc2e4 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
@@ -103,7 +103,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
     @Override
     @Transactional
     public int insertEmisTmsCostFee(EmisTmsCostFee emisTmsCostFee) throws EmisBizError {
-        // billRelList
         if(CollectionUtils.isEmpty(emisTmsCostFee.getBillRelList())){
             throw new EmisBizError(EmisBizErrorType.FAIL,"关联单号不能为空");
         }
@@ -111,29 +110,22 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         String costNo = WaybillHelper.genCostNo();
         emisTmsCostFee.setCostNo(costNo);
         // 插入关联单号
-        for (EmisTmsCostFeeRel costFeeRel:emisTmsCostFee.getBillRelList()) {
-            EmisTmsCostFeeRel newCostFeeRel = new EmisTmsCostFeeRel();
-            newCostFeeRel.setCostNo(costNo);
-            newCostFeeRel.setBillCode(costFeeRel.getBillCode());
-            emisTmsCostFeeRelMapper.insertEmisTmsCostFeeRel(newCostFeeRel);
+        for (EmisTmsCostFeeRel costFeeRelItem:emisTmsCostFee.getBillRelList()) {
+            costFeeRelItem.setId(null);
+            costFeeRelItem.setCostNo(costNo);
+            emisTmsCostFeeRelMapper.insertEmisTmsCostFeeRel(costFeeRelItem);
         }
 
         emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee);
-
         // 插入关联费用
-        for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
-        ) {
-            EmisTmsCostFeeFeeitem newFeeItem = new EmisTmsCostFeeFeeitem();
-            newFeeItem.setCostNo(costNo);
-            newFeeItem.setFeeType(feeItem.getFeeType());
-            newFeeItem.setPrice(feeItem.getPrice());
-            newFeeItem.setFee(feeItem.getFee());
-            newFeeItem.setCurrency(feeItem.getCurrency());
-            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(newFeeItem);
+        for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()) {
+            feeItem.setId(null);
+            feeItem.setCostNo(costNo);
+            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
         }
 
         // 计算分摊费用
-//        reCalcSplitCostFee(costNo);
+//      reCalcSplitCostFee(costNo);
 
         return 1;
     }
@@ -182,7 +174,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
 
         // 计算分摊成本
         for (EmisTmsCostFeeRel billCodeItem: listBillCodeRel) {
-
             // 循环费用类型
             for (EmisTmsCostFeeFeeitem feeItem: listFeeItemRel) {
                 EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
@@ -305,13 +296,9 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         // 插入关联费用
         for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
         ) {
-            EmisTmsCostFeeFeeitem newFeeItem = new EmisTmsCostFeeFeeitem();
-            newFeeItem.setCostNo(costNo);
-            newFeeItem.setFeeType(feeItem.getFeeType());
-            newFeeItem.setFee(feeItem.getFee());
-            newFeeItem.setPrice(feeItem.getPrice());
-            newFeeItem.setCurrency(feeItem.getCurrency());
-            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(newFeeItem);
+            feeItem.setId(null);
+            feeItem.setCostNo(costNo);
+            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
         }
 
         emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee);