From 393b1ded5ee24869d5445b44a86c99cfc1acf089 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 27 Aug 2024 07:04:05 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSettleBillController.java     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index 72de40797..982e73014 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -458,7 +458,6 @@ public class EmisSettleBillController extends BaseController
                 voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
 
                 String feeRemark="";
-
                 if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){
                     feeRemark=billItem.getWaybillDetail().getRemark();
                 }
@@ -469,8 +468,6 @@ public class EmisSettleBillController extends BaseController
 
 
 
-                voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark());
-
                 BigDecimal otherFee = BigDecimal.ZERO;
                 BigDecimal transFee = BigDecimal.ZERO;
                 BigDecimal cebFee = BigDecimal.ZERO;
@@ -480,6 +477,8 @@ public class EmisSettleBillController extends BaseController
                 String declareFeeStr = "";
                 String otherFeeStr = "";
 
+                String feeItemRemark="";
+
                  //计算分项数据
                 List<EmisSettleSubBillFeeitem>  feeItemList=billItem.getFeeitemList();
                 if( !CollectionUtils.isEmpty(feeItemList)){
@@ -514,6 +513,7 @@ public class EmisSettleBillController extends BaseController
                             otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+",";
                         }
 
+
                         if(
                                 cebFee.compareTo(BigDecimal.ZERO)>0
                                 || declareFee.compareTo(BigDecimal.ZERO)>0
@@ -522,6 +522,12 @@ public class EmisSettleBillController extends BaseController
                             isNeedComplexTpl=true;
                         }
 
+                        if(!StringUtils.isEmpty(feeitem.getRemark())){
+                            if(!feeitem.getRemark().contains("w")){
+                                feeItemRemark=feeItemRemark+"["+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+"],";
+                            }
+                        }
+
                     }
                 }else{
                     transFeeStr=billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString();
@@ -548,6 +554,8 @@ public class EmisSettleBillController extends BaseController
                 voMap.put("declareFee",declareFeeStr);
                 voMap.put("otherFee",otherFeeStr);
 
+                voMap.put("feeRemark", feeRemark+","+feeItemRemark);
+
                 listMap.add(voMap);
             }