diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index c04625a5..8779ce7e 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -304,6 +304,10 @@ namespace Myshipping.Application
{
item.ETD = Convert.ToDateTime(item.ETD).ToString("yyyy-MM-dd");
}
+ if (!string.IsNullOrWhiteSpace(item.ETA))
+ {
+ item.ETA = Convert.ToDateTime(item.ETA).ToString("yyyy-MM-dd");
+ }
}
return list;
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
index b75d5fe0..eb0da65c 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
@@ -152,7 +152,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
/// 预计到港日期
///
[Description("预计到港日期")]
- public DateTime? ETA { get; set; }
+ public string ETA { get; set; }
///
/// 收货地代码
///
diff --git a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
index 4e2bc34c..c85d43c1 100644
--- a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
+++ b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
@@ -60,9 +60,13 @@ namespace Myshipping.Application.Entity
///
public DateTime? ETA { get; set; }
///
- /// 默认码头
+ /// 场站
///
- public string Wharf { get; set; }
+ public string Yard { get; set; }
+ ///
+ /// 场站Code
+ ///
+ public string YardCode { get; set; }
///
/// 实际离港日期
@@ -133,9 +137,13 @@ namespace Myshipping.Application.Entity
///
public DateTime? ETA { get; set; }
///
- /// 默认码头
+ /// 场站
+ ///
+ public string Yard { get; set; }
+ ///
+ /// 场站Code
///
- public string Wharf { get; set; }
+ public string YardCode { get; set; }
///
/// 实际离港日期