中转订单详情

AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs

@@ -42,7 +42,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 
 			var transitDetail = new oms_wei_order_item_transit_detail_info()
 			{
-
+				TransitTypeStr = "发货包裹",
 
 				OrderCode = transitOrder.order_code,
 				SourceCode = transitOrder.random_code,
@@ -58,7 +58,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 				UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
 				DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
 				BuyReundStatus = transitOrder.refund_status,
-			
+
+				PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
 				InboundTime = transitOrder.inbound_time,
 				OutboundTime = transitOrder.outbound_time,
 			};
@@ -116,10 +117,10 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		set { this.SetValue(x => x.SourceCode, value); }
 	}
 	/// <summary> 取号时间((中转单)创建时间) </summary>
-	public DateTime PickUpTime
+	public DateTime? PickUpTime
 	{
 		get { return this.GetValue(x => x.PickUpTime); }
-		set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value.ToString("yyyy-MM-dd HH:mm:ss"); }
+		set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
 	}
 	public string PickUpTimeStr
 	{