1

Myshipping.Application/Entity/BookingOrder.cs

@@ -931,9 +931,22 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 中转预计离港
         /// </summary>
-        [Description("中转离港")]
+        [Description("中转预计离港")]
         public DateTime? MiddleETD { get; set; }
 
+
+        /// <summary>
+        /// 中转实际到港
+        /// </summary>
+        [Description("中转实际到港")]
+        public DateTime? MiddleATA { get; set; }
+        /// <summary>
+        /// 中转实际离港
+        /// </summary>
+        [Description("中转实际离港")]
+        public DateTime? MiddleATD { get; set; }
+
+
         /// <summary>
         /// 实际到港（目的港）
         /// </summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -546,6 +546,15 @@ namespace Myshipping.Application
                     it.LstShipOrderCompareDate,
                     it.LstShipOrderCompareRlt,
                     it.LstShipOrderCompareRltName,
+                    it.ATD,
+                    it.ETA,
+                    it.StartETA,
+                    it.StartATA,
+                    it.MiddleETA,
+                    it.MiddleETD,
+                    it.MiddleATA,
+                    it.MiddleATD,
+                    it.ATA
                 }).ExecuteCommandAsync();
                 var ctnlist = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == input.Id && x.IsDeleted == false).Select(x => x.Id).ToListAsync();
                 await _repCtn.DeleteAsync(x => x.BILLID == input.Id);

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

@@ -104,14 +104,7 @@ namespace Myshipping.Application
         /// 内部航次
         /// </summary>
         public string VOYNOINNER { get; set; }
-        /// <summary>
-        /// 开船日期
-        /// </summary>
-        public DateTime? ETD { get; set; }
-        /// <summary>
-        /// 实际开船日期
-        /// </summary>
-        public DateTime? ATD { get; set; }
+
         /// <summary>
         /// 截港日期
         /// </summary>
@@ -124,10 +117,7 @@ namespace Myshipping.Application
         /// 截VGM时间
         /// </summary>
         public DateTime? CLOSEVGMDATE { get; set; }
-        /// <summary>
-        /// 预计到港日期
-        /// </summary>
-        public DateTime? ETA { get; set; }
+
         /// <summary>
         /// 收货地代码
         /// </summary>
@@ -723,9 +713,75 @@ namespace Myshipping.Application
         public string SourceName { get; set; }
 
 
+   
+
+
+        #region 船舶日期相关
+        /// <summary>
+        /// 开船日期（船司提供的开船日期，操作填写）
+        /// </summary>
+        [Description("开船日期")]
+        public DateTime? ETD { get; set; }
         /// <summary>
-        /// 运港通ETD
+        /// 运港通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? MiddleATA { get; set; }
+        /// <summary>
+        /// 中转实际离港
+        /// </summary>
+        [Description("中转实际离港")]
+        public DateTime? MiddleATD { get; set; }
+
+
+        /// <summary>
+        /// 实际到港（目的港）
+        /// </summary>
+        [Description("实际到港")]
+        public DateTime? ATA { get; set; }
+
+        #endregion
     }
 }

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

@@ -123,16 +123,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// </summary>
         [Description("内部航次")]
         public string VOYNOINNER { get; set; }
-        /// <summary>
-        /// 开船日期
-        /// </summary>
-        [Description("开船日期")]
-        public string ETD { get; set; } 
-        /// <summary>
-        /// 实际开船日期
-        /// </summary>
-        [Description("实际开船日期")]
-        public DateTime? ATD { get; set; }
+ 
         /// <summary>
         /// 截港日期
         /// </summary>
@@ -148,11 +139,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// </summary>
         [Description("截VGM时间")]
         public DateTime? CLOSEVGMDATE { get; set; }
-        /// <summary>
-        /// 预计到港日期
-        /// </summary>
-        [Description("预计到港日期")]
-        public string ETA { get; set; }
+ 
         /// <summary>
         /// 收货地代码
         /// </summary>
@@ -850,9 +837,75 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动
         /// </summary>
         public string LstShipOrderCompareMode { get; set; }
+ 
+
+
+        #region 船舶日期相关
+        /// <summary>
+        /// 开船日期（船司提供的开船日期，操作填写）
+        /// </summary>
+        [Description("开船日期")]
+        public string ETD { get; set; }
         /// <summary>
-        /// 运港通ETD
+        /// 运港通ETD（爬取的ETD）
         /// </summary>
+        [Description("ETD")]
         public DateTime? YgtETD { get; set; }
+        /// <summary>
+        /// 实际开船日期
+        /// </summary>
+        [Description("实际开船日期")]
+        public DateTime? ATD { get; set; }
+        /// <summary>
+        /// 预计到港日期（目的港）
+        /// </summary>
+        [Description("预计到港日期")]
+        public string 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? MiddleATA { get; set; }
+        /// <summary>
+        /// 中转实际离港
+        /// </summary>
+        [Description("中转实际离港")]
+        public DateTime? MiddleATD { get; set; }
+
+
+        /// <summary>
+        /// 实际到港（目的港）
+        /// </summary>
+        [Description("实际到港")]
+        public DateTime? ATA { get; set; }
+
+        #endregion
     }
 }