diff --git a/BBWY.Server.Model/Db/Order/ExpressOrder.cs b/BBWY.Server.Model/Db/Order/ExpressOrder.cs index a5d2791e..78649d07 100644 --- a/BBWY.Server.Model/Db/Order/ExpressOrder.cs +++ b/BBWY.Server.Model/Db/Order/ExpressOrder.cs @@ -41,14 +41,9 @@ namespace BBWY.Server.Model.Db public string PurchaseOrderId { get; set; } - /// - /// 服务单Id;可空 - /// - [Column(StringLength = 100)] - public string ServiceId { get; set; } /// - /// 物流状态(0=待入库,1=已入库,2=派送中,3=运输中) + /// 物流状态(0=待质检,1=已入库,2=派送中,3=运输中) /// public int? TransportStatus { get; set; } @@ -62,6 +57,18 @@ namespace BBWY.Server.Model.Db [Column(StringLength = 100)] public string WayBillNo { get; set; } + /// + /// 质检入库时间 + /// + [Column(DbType = "datetime")] + public DateTime? QualityInspectionInStoreTime { get; set; } + + /// + /// 签名时间 + /// + [Column(DbType = "datetime")] + public DateTime? SignTime { get; set; } + } } diff --git a/BBWY.Server.Model/Db/Order/Serviceorder.cs b/BBWY.Server.Model/Db/Order/Serviceorder.cs index 231310b1..9e7193ab 100644 --- a/BBWY.Server.Model/Db/Order/Serviceorder.cs +++ b/BBWY.Server.Model/Db/Order/Serviceorder.cs @@ -261,7 +261,7 @@ namespace BBWY.Server.Model.Db { public decimal? StorageAmount { get; set; } = 0.00M; /// - /// 服务单物流状态(0=待入库,1=已入库,2=派送中,3=运输中) + /// 服务单物流状态(0=待质检,1=已入库,2=派送中,3=运输中) /// public int? TransportDetails { get; set; } @@ -273,6 +273,23 @@ namespace BBWY.Server.Model.Db { public string WareHouseGrounpRemark { get; set; } + /// + /// 快递单号 + /// + [Column(StringLength = 100)] + public string WayBillNo { get; set; } + + /// + /// 快递公司名称 + /// + [Column(StringLength = 100)] + public string ExpressName { get; set; } + + /// + /// 质检入库时间 + /// + [Column(DbType = "datetime")] + public DateTime? QualityInspectionInStoreTime { get; set; } } }