Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/EDI/Dtos/EDIBaseModel.cs

@@ -76,5 +76,10 @@ namespace Myshipping.Application
         /// 发送方别名代码
         /// </summary>
         public string ALIASSENDCODE { get; set; }
+
+        /// <summary>
+        /// 发货方代码
+        /// </summary>
+        public string SENDSHIPPERCODE { get; set; }
     }
 }

Myshipping.Application/EDI/TSLEdiHelper.cs

@@ -1020,11 +1020,19 @@ namespace Myshipping.Application.EDI.TSL
 
                 List<System.String> ShippingList = formatlengthStr(Shipping, 35);
 
+                //2023-03-16 测试比对德翔有固定发货方代码，从FTP配置读取
+                string sendShipperCode = string.Empty;
+
+                if(!string.IsNullOrWhiteSpace(InttrEdi.SENDSHIPPERCODE))
+                {
+                    sendShipperCode = InttrEdi.SENDSHIPPERCODE?.Trim();
+                }
+
                 if (ShippingList.Count != 0 && Shipping.Length > 0)
                 {
                     for (var i = 0; i < ShippingList.Count; i++)
                     {
-                        if (i == 0) Shipping = "NAD+CZ+++" + ShippingList[0] + "+";
+                        if (i == 0) Shipping = "NAD+CZ+"+ sendShipperCode + "++" + ShippingList[0] + "+";
                         if (i == 1) Shipping = Shipping + ShippingList[i];
                         if (i == 2 || i == 3) Shipping = Shipping + ":" + ShippingList[i];
                         if (i >= 4 && ShippingList.Count > 5)

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -3249,6 +3249,7 @@ namespace Myshipping.Application
             ediModel.SENDCOMPANYCODE = ftpSet.SENDCOMPANYCODE;
             ediModel.SENDSUBCOMPANYCODE = ftpSet.SENDSUBCOMPANYCODE;
             ediModel.ALIASSENDCODE = ftpSet.ALIASSENDCODE;
+            ediModel.SENDSHIPPERCODE = ftpSet.SENDSHIPPERCODE;
 
             ediModel.filetype = model.sendType; //订舱
             ediModel.filerole = model.fileRole;

Myshipping.Core/Entity/DJY/DjyEdiSetting.cs

@@ -124,5 +124,10 @@ namespace Myshipping.Core.Entity
         /// 发送方别名
         /// </summary>
         public string ALIASSENDCODE { get; set; }
+
+        /// <summary>
+        /// 发货方代码
+        /// </summary>
+        public string SENDSHIPPERCODE { get; set; }
     }
 }

Myshipping.Core/Myshipping.Core.xml

@@ -2054,6 +2054,11 @@
             发送方别名
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.DjyEdiSetting.SENDSHIPPERCODE">
+            <summary>
+            发货方代码
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.Entity.DjyTenantConfig">
             <summary>
             
@@ -15534,6 +15539,11 @@
             发送方别名
             </summary>
         </member>
+        <member name="P:Myshipping.Core.DjyEdiSettingInput.SENDSHIPPERCODE">
+            <summary>
+            发货方代码
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.AddDjyEdiSettingInput">
             <summary>
             EDI参数设置新增输入参数

Myshipping.Core/Service/DjyEdiSetting/Dto/DjyEdiSettingInput.cs

@@ -147,6 +147,11 @@ namespace Myshipping.Core
         /// 发送方别名
         /// </summary>
         public string ALIASSENDCODE { get; set; }
+
+        /// <summary>
+        /// 发货方代码
+        /// </summary>
+        public string SENDSHIPPERCODE { get; set; }
     }
 
     /// <summary>