From 108f336dc4509629e91ef34f18bc3eec9ee1dcaa Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Fri, 10 Feb 2023 14:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=20SR2023020800004/5=20?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MsInfoClientController.cs     | 10 +++----
 .../MvcShipping/DAL/MsChFee/MsChFeeDAL.cs     | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
index a47672be..e5df3b27 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
@@ -273,11 +273,11 @@ namespace DSWeb.MvcShipping.Controllers
                 isPost = false;
                 errorstr = "简称含有'等特殊字符";
             }
-            if (headData.DESCRIPTION.IndexOf("'") > 0)
-            {
-                isPost = false;
-                errorstr = "全称含有'等特殊字符";
-            }
+            //if (headData.DESCRIPTION.IndexOf("'") > 0)
+            //{
+            //    isPost = false;
+            //    errorstr = "全称含有'等特殊字符";
+            //}
             if (headData.CUSTNUM == "") {
                 headData.CUSTNUM= MsInfoClientDAL.GetMaxNum();
             }
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
index ef34c0c9..5db1c4aa 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
@@ -186,8 +186,38 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                         new SqlParameter(PARM_FEE_GID,SqlDbType.VarChar,36)
                     };
 
+                    var customertypeDic = new Dictionary<string, string>
+                    {
+                        { "CUSTOMERNAME", "委托单位" },
+                        { "CARRIER", "船公司" },
+                        { "FORWARDER", "订舱代理" },
+                        { "CUSTOMSER", "报关行" },
+                        { "TRUCKER", "车队" },
+                        { "SHIPPERID", "发货人" },
+                        { "CONSIGNEEID", "收货人" },
+                        { "NOTIFYPARTYID", "通知人" },
+                        { "AGENTID", "代理" },
+                        { "YARD", "场站" }
+                    };
+
                     foreach (MsChFee feeEntity in tempFeeEntities)
                     {
+                        //20230210 根据CustomerType的值将其改为汉字的值
+                        /*        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "WTDW-委托单位", "CUSTTYPE": "委托单位", "CUSTNAME": "CUSTOMERNAME" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "CGS-船公司", "CUSTTYPE": "船公司", "CUSTNAME": "CARRIER" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "DCDL-订舱代理", "CUSTTYPE": "订舱代理", "CUSTNAME": "FORWARDER" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "BGH-报关行", "CUSTTYPE": "报关行", "CUSTNAME": "CUSTOMSER" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "CD-车队", "CUSTTYPE": "车队", "CUSTNAME": "TRUCKER" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "FHR-发货人", "CUSTTYPE": "发货人", "CUSTNAME": "SHIPPERID" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "SHR-收货人", "CUSTTYPE": "收货人", "CUSTNAME": "CONSIGNEEID" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "TZR-通知人", "CUSTTYPE": "通知人", "CUSTNAME": "NOTIFYPARTYID" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "DL-代理", "CUSTTYPE": "代理", "CUSTNAME": "AGENTID" });
+        this.panelFee.StoreCustType.add({ "SCUSTTYPE": "CZ-场站", "CUSTTYPE": "场站", "CUSTNAME": "YARD" });*/
+
+
+                        if (customertypeDic.ContainsKey(feeEntity.CustomerType)) 
+                            feeEntity.CustomerType = customertypeDic[feeEntity.CustomerType];
+
                         if (feeEntity.BsNo == "*" || feeEntity.BsNo == "")
                         {
                             SqlParameter[] parms = GetInsertParms();