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 79b2fc822..aec14d6d6 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
@@ -465,7 +465,7 @@ public class EmisSettleBillController extends BaseController
                     BigDecimal declareFee = BigDecimal.ZERO;
 
 
-                    String transFeeStr = "0";
+                    String transFeeStr = "";
                     String cebFeeStr = "";
                     String declareFeeStr = "";
                     String otherFeeStr = "";
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 1d98bdeb8..9d89fb969 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1348,21 +1348,25 @@ public class EmisBaseService {
      public void redoGenerateBillFeeItem(String billCode) throws EmisBizError{
          log.error("===>Start 生成费用明细:"+billCode);
 
+         EmisWaybill dt=emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
+
          // 删除旧明细数据
          emisSettleSubBillFeeitemMapper.deleteEmisSettleSubBillFeeitemByBillCode(billCode);
          // 产生新的费用明细
-         List<EmisWaybillFeeitem> feeitemList = emisWaybillFeeitemMapper.selectFeeitemListByWaybillId(dt.getId());
-         for(EmisWaybillFeeitem feeitem:feeitemList){
-             EmisSettleSubBillFeeitem  emisSettleSubBillFeeitem =new EmisSettleSubBillFeeitem();
-             emisSettleSubBillFeeitem.setSubBillNo(billCode);
-             emisSettleSubBillFeeitem.setBillCode(billCode);
-             emisSettleSubBillFeeitem.setBillFee(feeitem.getRealFee());
-             emisSettleSubBillFeeitem.setCurrency(feeitem.getCurrency());
-             emisSettleSubBillFeeitem.setFeeCode(feeitem.getFeeCode());
-             emisSettleSubBillFeeitem.setFeeName(feeitem.getFeeName());
-             emisSettleSubBillFeeitem.setOrigFee(feeitem.getFee());
-             emisSettleSubBillFeeitem.setRemark(feeitem.getRemark());
-             emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
+         if(!dt.getCalcFeeType().equals("3")) {
+             List<EmisWaybillFeeitem> feeitemList = emisWaybillFeeitemMapper.selectFeeitemListByWaybillId(dt.getId());
+             for (EmisWaybillFeeitem feeitem : feeitemList) {
+                 EmisSettleSubBillFeeitem emisSettleSubBillFeeitem = new EmisSettleSubBillFeeitem();
+                 emisSettleSubBillFeeitem.setSubBillNo(billCode);
+                 emisSettleSubBillFeeitem.setBillCode(billCode);
+                 emisSettleSubBillFeeitem.setBillFee(feeitem.getRealFee());
+                 emisSettleSubBillFeeitem.setCurrency(feeitem.getCurrency());
+                 emisSettleSubBillFeeitem.setFeeCode(feeitem.getFeeCode());
+                 emisSettleSubBillFeeitem.setFeeName(feeitem.getFeeName());
+                 emisSettleSubBillFeeitem.setOrigFee(feeitem.getFee());
+                 emisSettleSubBillFeeitem.setRemark(feeitem.getRemark());
+                 emisSettleSubBillFeeitemMapper.insertEmisSettleSubBillFeeitem(emisSettleSubBillFeeitem);
+             }
          }
 
          log.error("===>End 生成费用明细");