From 8ccc44e2000a659f585fa2a9938579a86995d9e8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 26 Aug 2024 07:30:33 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisSettleBillController.java    | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 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 1e87bf3eb..094b69b6c 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
@@ -472,37 +472,44 @@ public class EmisSettleBillController extends BaseController
 
                     for (EmisSettleSubBillFeeitem feeitem : feeItemList) {
 
+                            String currencyStr="";
                             if(StringUtils.isEmpty(feeitem.getCurrency())){
                                 feeitem.setCurrency("CNY");
+                                currencyStr="";
+                            }else{
+                                currencyStr="("+feeitem.getCurrency()+")";
                             }
 
 //                        if ("CNY".equals(feeitem.getCurrency())) {
                             if ("1001".equals(feeitem.getFeeCode())) {
                                 transFee = transFee.add(feeitem.getBillFee());
-                                transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")";
+                                transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
                             }
                             // 报关费
                             else if ("2002".equals(feeitem.getFeeCode())) {
                                 cebFee = cebFee.add(feeitem.getBillFee());
-                                cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")";
+                                cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
                             }
                             // 清关费
                             else if ("2003".equals(feeitem.getFeeCode())) {
                                 declareFee = declareFee.add(feeitem.getBillFee());
-                                declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")";
+                                declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
 
                             } else {
                                 otherFee = otherFee.add(feeitem.getBillFee());
-                                otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")"+",";
+                                otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+",";
                             }
 //                        }
                     }
 //                    voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString());
-                    voMap.put("transFee", transFeeStr);
+
                     if(StringUtils.isEmpty(transFeeStr)){
-                        transFeeStr="0(CNY)";
+                        transFeeStr="0";
                     }
 
+                    voMap.put("transFee", transFeeStr);
+
+
                     if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) {
                         tplName = "tpl/bill_tpl.xlsx";
 //                        voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString());
@@ -510,18 +517,17 @@ public class EmisSettleBillController extends BaseController
 //                        voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString());
 
                           if(StringUtils.isEmpty(cebFeeStr)){
-                              cebFeeStr="0(CNY)";
+                              cebFeeStr="0";
                           }
 
                           if(StringUtils.isEmpty(declareFeeStr)){
-                              declareFeeStr="0(CNY)";
+                              declareFeeStr="0";
                           }
 
                           if(StringUtils.isEmpty(otherFeeStr)){
-                              otherFeeStr="0(CNY)";
+                              otherFeeStr="0";
                           }
 
-
                           voMap.put("cebFee", cebFeeStr);
                           voMap.put("declareFee", declareFeeStr);
                           voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,","));