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