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

Myshipping.Application/Entity/BookingOrder.cs

@@ -122,16 +122,6 @@ namespace Myshipping.Application.Entity
         [Description("内部航次")]
         public string VOYNOINNER { get; set; }
         /// <summary>
-        /// 开船日期
-        /// </summary>
-        [Description("开船日期")]
-        public DateTime? ETD { get; set; }
-        /// <summary>
-        /// 实际开船日期
-        /// </summary>
-        [Description("实际开船日期")]
-        public DateTime? ATD { get; set; }
-        /// <summary>
         /// 截港日期
         /// </summary>
         [Description("截港日期")]
@@ -147,11 +137,6 @@ namespace Myshipping.Application.Entity
         [Description("截VGM时间")]
         public DateTime? CLOSEVGMDATE { get; set; }
         /// <summary>
-        /// 预计到港日期
-        /// </summary>
-        [Description("预计到港日期")]
-        public DateTime? ETA { get; set; }
-        /// <summary>
         /// 收货地代码
         /// </summary>
         //[Description("收货地代码")]
@@ -819,7 +804,7 @@ namespace Myshipping.Application.Entity
         public string WarehouseID { get; set; }
 
         /// <summary>
-        /// ep号
+        /// ep号（作废，使用真提单号字段）
         /// </summary>
         [Description("ep号")]
         public string EPCode { get; set; }
@@ -902,12 +887,59 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string SourceName { get; set; }
 
-
+        #region 船舶日期相关
         /// <summary>
-        /// ETD
+        /// 开船日期（船司提供的开船日期，操作填写）
+        /// </summary>
+        [Description("开船日期")]
+        public DateTime? ETD { get; set; }
+        /// <summary>
+        /// 运港通ETD（爬取的ETD）
         /// </summary>
         [Description("ETD")]
         public DateTime? YgtETD { get; set; }
+        /// <summary>
+        /// 实际开船日期
+        /// </summary>
+        [Description("实际开船日期")]
+        public DateTime? ATD { get; set; }
+        /// <summary>
+        /// 预计到港日期（目的港）
+        /// </summary>
+        [Description("预计到港日期")]
+        public DateTime? ETA { get; set; }
+
+
+        /// <summary>
+        /// 起始港预抵日期
+        /// </summary>
+        [Description("预抵日期")]
+        public DateTime? StartETA { get; set; }
+
+        /// <summary>
+        /// 起始港实际抵港
+        /// </summary>
+        [Description("实际抵港")]
+        public DateTime? StartATA { get; set; }
+
+        /// <summary>
+        /// 中转预抵
+        /// </summary>
+        [Description("预抵日期")]
+        public DateTime? MiddleETA { get; set; }
+
+        /// <summary>
+        /// 中转预计离港
+        /// </summary>
+        [Description("中转离港")]
+        public DateTime? MiddleETD { get; set; }
+
+        /// <summary>
+        /// 实际到港（目的港）
+        /// </summary>
+        [Description("实际到港")]
+        public DateTime? ATA { get; set; }
 
+        #endregion
     }
 }