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

---
 .../impl/EmisTmsCostFeeServiceImpl.java       | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 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 70e3cc2e4..b34671775 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
@@ -117,11 +117,16 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         }
 
         emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee);
-        // 插入关联费用
+        // 插入关联费用,只保存费用大于0的费用
         for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()) {
-            feeItem.setId(null);
-            feeItem.setCostNo(costNo);
-            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
+            if(
+                    (feeItem.getFee()!=null && feeItem.getFee().compareTo(BigDecimal.ZERO)>0)
+                ||  (feeItem.getPrice()!=null && feeItem.getPrice().compareTo(BigDecimal.ZERO)>0)
+            ) {
+                feeItem.setId(null);
+                feeItem.setCostNo(costNo);
+                emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
+            }
         }
 
         // 计算分摊费用
@@ -159,7 +164,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
             throw  new EmisBizError(EmisBizErrorType.FAIL,"费用为空，请检查");
         }
 
-
         Integer pieceNumber = 0;
         // 计算总重量
         for (EmisTmsCostFeeRel billCodeRel: listBillCodeRel) {
@@ -296,9 +300,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         // 插入关联费用
         for (EmisTmsCostFeeFeeitem feeItem:emisTmsCostFee.getFeeItemList()
         ) {
-            feeItem.setId(null);
-            feeItem.setCostNo(costNo);
-            emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
+            if(
+                    (feeItem.getFee()!=null && feeItem.getFee().compareTo(BigDecimal.ZERO)>0)
+                            ||  (feeItem.getPrice()!=null && feeItem.getPrice().compareTo(BigDecimal.ZERO)>0)
+            ) {
+                feeItem.setId(null);
+                feeItem.setCostNo(costNo);
+                emisTmsCostFeeFeeitemMapper.insertEmisTmsCostFeeFeeitem(feeItem);
+            }
         }
 
         emisTmsCostFeeMapper.updateEmisTmsCostFee(emisTmsCostFee);