From 1c5043aa60c209e6f8fe152a490b5e07645e270d Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Tue, 27 Aug 2024 20:12:10 +0800
Subject: [PATCH] =?UTF-8?q?20240827=20=E8=88=B1=E5=8D=95=E7=9B=B4=E5=8F=91?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=EF=BC=8C=E7=BB=93=E7=AE=97=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E2=80=9C=E9=9D=92=E5=B2=9B=E5=A4=A7=E7=AE=80?=
 =?UTF-8?q?=E4=BA=91=E2=80=9D=20=E4=BD=BF=E7=94=A8=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B81003=E5=BD=93=E4=B8=AD=EF=BC=8Cenumvalueid?=
 =?UTF-8?q?=3D=E2=80=98=E7=BB=93=E7=AE=97=E5=AF=B9=E8=B1=A1=E2=80=99=20?=
 =?UTF-8?q?=E7=9A=84=20EnumValueName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChInvoiceapplicationBLEdit.js                      |  2 +-
 .../MvcShipping/Controllers/MsOpSeaeEdiController.cs   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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")
                     {