Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

# Conflicts:
#	BookingJieFeng/BookingJieFeng.csproj.user
#	BookingWeb/BookingWeb.csproj.user
#	DSWeb/DSWeb.csproj.user
#	DispatchWeb/DispatchWeb.csproj.user

.gitignore

@@ -59,3 +59,8 @@ DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
 /WebSqlHelper/Fakes/Microsoft.Practices.EnterpriseLibrary.Common.fakes
 /BookingWeb/App_Data/Logs/debug.log20221102
 /BookingWeb/App_Data/Logs
+/packages
+/BookingJieFeng/BookingJieFeng.csproj.user
+/BookingWeb/BookingWeb.csproj.user
+/DispatchWeb/DispatchWeb.csproj.user
+/DSWeb/DSWeb.csproj.user

DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

@@ -188,8 +188,27 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                         new SqlParameter(PARM_FEE_GID,SqlDbType.VarChar,36)
                     };
 
+                    //20230210 增加但未启用 用于批量修改添加费用时 对应客户类型(应为中文 批量录入时为英文)
+                    //var customertypeDic = new Dictionary<string, string>
+                    //{
+                    //    { "CUSTOMERNAME", "委托单位" },
+                    //    { "CARRIER", "船公司" },
+                    //    { "FORWARDER", "订舱代理" },
+                    //    { "CUSTOMSER", "报关行" },
+                    //    { "TRUCKER", "车队" },
+                    //    { "SHIPPERID", "发货人" },
+                    //    { "CONSIGNEEID", "收货人" },
+                    //    { "NOTIFYPARTYID", "通知人" },
+                    //    { "AGENTID", "代理" },
+                    //    { "YARD", "场站" }
+                    //};
+
                     foreach (MsChFee feeEntity in tempFeeEntities)
                     {
+                        //20230210 增加但未启用
+                        //if (customertypeDic.ContainsKey(feeEntity.CustomerType))
+                        //    feeEntity.CustomerType = customertypeDic[feeEntity.CustomerType];
+
                         if (feeEntity.BsNo == "*" || feeEntity.BsNo == "")
                         {
                             SqlParameter[] parms = GetInsertParms();

DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGl/MsCwVouchersGlEdit.js

@@ -2448,7 +2448,8 @@ Ext.extend(Shipping.MsCwVouchersGlEdit, Ext.Panel, {
                     var strVOUNO = arrayList[3].toString();
                     var strVOUDATE = arrayList[4].toString();
                     var strACCDATE = arrayList[5].toString();
-                    this.formHead.getForm().findField('VOUNO').setValue(sVOUNO);
+                    //this.formHead.getForm().findField('VOUNO').setValue(sVOUNO);
+                    this.formHead.getForm().findField('VOUNO').setValue("");//复制时清空凭证号
                     this.formHead.getForm().findField('lbTitle2').setValue(strY + "年第" + strM + "期");
                     //
                     this.formHead.getForm().findField('VOUDATE').setValue(strVOUDATE);