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

Myshipping.Application/Entity/BookingOrderSeaeEdi.cs

@@ -41,6 +41,10 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string VOYNO { get; set; }
         /// <summary>
+        /// 船公司ID
+        /// </summary>
+        public string CARRIERID { get; set; }
+        /// <summary>
         /// 船公司EDI
         /// </summary>
         public string CARRIER { get; set; }

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -109,6 +109,9 @@ namespace Myshipping.Application
             entity.State = "已录入";
             if (input.Id == 0)
             {
+                if (!string.IsNullOrEmpty(entity.CARRIERID)) {
+                    entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
+                }
              
                 await _seaeedi.InsertAsync(entity);
                 if (input.EdiCtn != null)
@@ -129,7 +132,10 @@ namespace Myshipping.Application
             }
             else
             {
-
+                if (!string.IsNullOrEmpty(entity.CARRIERID))
+                {
+                    entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
+                }
                 await _seaeedi.AsUpdateable(entity).IgnoreColumns(it => new
                 {
                     it.MBLNO,

Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs

@@ -38,6 +38,10 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// </summary>
         public string VOYNO { get; set; }
         /// <summary>
+        /// 船公司ID
+        /// </summary>
+        public string CARRIERID { get; set; }
+        /// <summary>
         /// 船公司EDI
         /// </summary>
         public string CARRIER { get; set; }

Myshipping.Core/Myshipping.Core.xml

@@ -692,6 +692,11 @@
             场站映射
             </summary>
         </member>
+        <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_COMMON_DB_MAPPING_FORWARDER">
+            <summary>
+            船代映射
+            </summary>
+        </member>
         <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PORTLOAD">
             <summary>
             起始港映射
@@ -6351,6 +6356,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ISysCacheService.GetAllMappingForwarder">
+            <summary>
+            获取公共库 船代映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ISysCacheService.SetAllCodeCarrier(System.Collections.Generic.List{Myshipping.Core.Entity.CodeCarrier})">
             <summary>
             设置公共库 船公司
@@ -6441,6 +6452,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ISysCacheService.SetAllMappingForwarder(System.Collections.Generic.List{Myshipping.Core.Entity.MappingForwarder})">
+            <summary>
+            设置公共库 船代映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ISysCacheService.SetAllMappingPortLoad(System.Collections.Generic.List{Myshipping.Core.Entity.MappingPortLoad})">
             <summary>
             设置公共库 起始港映射
@@ -6865,6 +6882,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingForwarder">
+            <summary>
+            获取公共库 船代映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.SetAllCodeCarrier(System.Collections.Generic.List{Myshipping.Core.Entity.CodeCarrier})">
             <summary>
             设置公共库 船公司
@@ -6973,6 +6996,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.SysCacheService.SetAllMappingForwarder(System.Collections.Generic.List{Myshipping.Core.Entity.MappingForwarder})">
+            <summary>
+            设置公共库 船代映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.SetAllMappingPortLoad(System.Collections.Generic.List{Myshipping.Core.Entity.MappingPortLoad})">
             <summary>
             设置公共库 起始港映射
@@ -7767,6 +7796,16 @@
             新增船代信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.MappingForwarderList(Myshipping.Core.Service.MappingQueryDto)">
+            <summary>
+            获取船代映射
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateMappingForwarder(Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto)">
+            <summary>
+            新增编辑船代映射信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.YardList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取场站列表信息
@@ -8138,6 +8177,31 @@
             排序
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto.Code">
+            <summary>
+            代码
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto.Module">
+            <summary>
+            模块
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto.MapCode">
+            <summary>
+            映射code
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.CommonDB.Dto.MappingForwarderDto.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Service.CommonDB.Dto.CodeFrtDto.Code">
             <summary>
             代码