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

Myshipping.Application/ConfigOption/Mapper.cs

@@ -33,6 +33,11 @@ namespace Myshipping.Application
 
             config.ForType<BookingLog, BookingLogSyncCustomerDto>()
                 .Map(dest => dest.CreatedTime, src => src.CreatedTime.HasValue ? src.CreatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty);
+
+
+            config.ForType<BookingSoTemplate, BookingSoTemplateListOutput>()
+                .Map(dest => dest.CreatedTime, src => src.CreatedTime.HasValue ? src.CreatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null)
+                .Map(dest => dest.UpdatedTime, src => src.UpdatedTime.HasValue ? src.UpdatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null);
         }
     }
 }

Myshipping.Application/Entity/BookingOrder.cs

@@ -1025,5 +1025,30 @@ namespace Myshipping.Application.Entity
         /// </summary>
         [Description("删除时间")]
         public DateTime? DeleteTime { get; set; }
+
+        /// <summary>
+        /// 起运港唯一代码
+        /// </summary>
+        public string PORTLOADCODE { get; set; }
+
+        /// <summary>
+        /// 目的港唯一代码
+        /// </summary>
+        public string PORTDISCHARGECODE { get; set; }
+
+        /// <summary>
+        /// 目的地唯一代码
+        /// </summary>
+        public string DESTINATIONCODE { get; set; }
+
+        /// <summary>
+        /// 付费方式代码
+        /// </summary>
+        public string FRTCODE { get; set; }
+
+        /// <summary>
+        /// 运输条款代码
+        /// </summary>
+        public string SERVICECODE { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs

@@ -827,6 +827,32 @@ namespace Myshipping.Application
         /// </summary>
         public decimal CtrnHeight { get; set; }
 
+
+        /// <summary>
+        /// 起运港唯一代码
+        /// </summary>
+        public string PORTLOADCODE { get; set; }
+
+        /// <summary>
+        /// 目的港唯一代码
+        /// </summary>
+        public string PORTDISCHARGECODE { get; set; }
+
+        /// <summary>
+        /// 目的地唯一代码
+        /// </summary>
+        public string DESTINATIONCODE { get; set; }
+
+        /// <summary>
+        /// 付费方式代码
+        /// </summary>
+        public string FRTCODE { get; set; }
+
+        /// <summary>
+        /// 运输条款代码
+        /// </summary>
+        public string SERVICECODE { get; set; }
+
         /// <summary>
         /// 扩展状态
         /// </summary>

Myshipping.Application/Service/BookingOrder/Dto/SyncCustomerDto.cs

@@ -255,6 +255,31 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 订舱编号
         /// </summary>
         public string CUSTNO { get; set; }
+
+        /// <summary>
+        /// 起运港唯一代码
+        /// </summary>
+        public string PORTLOADCODE { get; set; }
+
+        /// <summary>
+        /// 目的港唯一代码
+        /// </summary>
+        public string PORTDISCHARGECODE { get; set; }
+
+        /// <summary>
+        /// 目的地唯一代码
+        /// </summary>
+        public string DESTINATIONCODE { get; set; }
+
+        /// <summary>
+        /// 付费方式代码
+        /// </summary>
+        public string FRTCODE { get; set; }
+
+        /// <summary>
+        /// 运输条款代码
+        /// </summary>
+        public string SERVICECODE { get; set; }
     }
 
     /// <summary>

Myshipping.Application/Service/BookingSoTemplate/Dto/BookingSoTemplateOutput.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Myshipping.Application
 {
@@ -7,6 +8,25 @@ namespace Myshipping.Application
     /// </summary>
     public class BookingSoTemplateListOutput : BookingSoTemplateDto
     {
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public virtual string CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public virtual string UpdatedTime { get; set; }
+
+        /// <summary>
+        /// 创建者名称
+        /// </summary>
+        public virtual string CreatedUserName { get; set; }
+
+        /// <summary>
+        /// 修改者名称
+        /// </summary>
+        public virtual string UpdatedUserName { get; set; }
 
     }