diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js
index 23fdd80d..de2d1ff6 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js
@@ -4257,7 +4257,7 @@ addBillfn: function () {
         sql = " (" + feeBSNOSql + ")";
         sql = sql + getAndConSql(sql, this.FeeSqlStr, this.FeeSqlStr);
     }
-    if (taxrate!='')
+    if (taxrate!='' && taxrate!="0")
       sql = sql + " and f.ACCTAXRATE=" + taxrate;
 
     _this = this;
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
index 2171ee99..19be4e87 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
@@ -1561,7 +1561,7 @@ namespace DSWeb.MvcShipping.Controllers
                         单量 = 分单号list.Count();
                     }
 
-                    MsChFeeDAL.MakeNewFee(USERID, item.BSNO, "青岛大简云", "其它", 2, "舱单费", amount * 单量, "单票", 单量);
+                    MsChFeeDAL.MakeNewFee(USERID, item.BSNO, pricehelper.CUSTOMERNAME, "其它", 2, "舱单费", amount * 单量, "单票", 单量);
 
 
                 }
@@ -1578,6 +1578,8 @@ namespace DSWeb.MvcShipping.Controllers
             private string filetype { get; set; }
             private bool isfen { get; set; } = false;
 
+            public string CUSTOMERNAME { get; set; } = "青岛大简云";
+
             public 船公司舱单价格helper()
             {
                 var cdc = new CommonDataContext();
@@ -1621,6 +1623,12 @@ namespace DSWeb.MvcShipping.Controllers
                         priceList = _d.EnumValueName_2.Split(',').ToList();
                     }
 
+                    var 结算对象= DetailList.FirstOrDefault(x => x.EnumValueID == "结算对象");
+                    if (结算对象 != null && string.IsNullOrWhiteSpace(结算对象.EnumValueID)) 
+                    {
+                        CUSTOMERNAME= 结算对象.EnumValueName;
+                    }
+
                     var amount = "0";
                     if (filetype == "B")
                     {