优化中转仓处理拍单流程 隐藏部分不可用功能

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -893,11 +893,6 @@ namespace AllBase.Model.DBModel
 
 		public bool GetIsAbnormal()
 		{
-			if (order_id == "3740040052771291904")
-			{
-
-			}
-
 			// 三退或者两退，为退款完成单
 			//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
 			//	(oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -1,11 +1,13 @@
 using AllBase.Helper;
 using AllBase.Model.MvvmBaseClasses;
+using NaiBa.Util;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json.Linq;
 using NPOI.SS.Formula.Functions;
 using Org.BouncyCastle.Asn1.Mozilla;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -20,13 +22,104 @@ namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_item_info : PropertyNotifyObject
     {
-        ///// <summary>
-        ///// 订单对应店铺
-        ///// </summary>
-        //public ShopLoginInfo Shop
-        //{
-        //    get { return this.GetValue(x => x.Shop); }
-        //    set { this.SetValue(x => x.Shop, value); }
+		public List<oms_wei_order_item_transit_detail_info> TransitPackageList
+		{
+			get { return this.GetValue(x => x.TransitPackageList); }
+			set
+			{
+				this.SetValue(x => x.TransitPackageList, value);
+				TransitPackageLatest = TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault(p => p.TransitVoidStatus != "已作废") ?? 
+					                   TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault() ?? 
+					                   new oms_wei_order_item_transit_detail_info();
+			}
+		}
+		public oms_wei_order_item_transit_detail_info TransitPackageLatest
+		{
+			get { return this.GetValue(x => x.TransitPackageLatest); }
+			set
+			{
+				this.SetValue(x => x.TransitPackageLatest, value);
+				TransitPackageLatestWarehouseStatusStr = value?.TransitTypeStr + value?.WarehouseStatus;
+				TransitPackageLatestVoidStatusStr = value?.TransitVoidStatus == "已作废" ? value?.TransitTypeStr + "已作废" : "";
+				if (order_id == "3740305724012410112")
+				{
+
+				}
+				if (value != null && value?.TransitTypeStr != "发货包裹")
+					VoidPackageTypeStr = "作废" + value?.TransitTypeStr;
+				else
+				{
+					VoidPackageTypeStr = "";
+					if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed;
+				}
+			}
+		}
+
+		public string TransitPackageLatestWarehouseStatusStr
+		{
+			get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStr); }
+			set
+			{
+				this.SetValue(x => x.TransitPackageLatestWarehouseStatusStr, value);
+				var str = value ?? "";
+
+				TransitPackageLatestWarehouseStatusStrVisibility = str.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
+
+				// 状态文字颜色
+				if (str.Contains("已出库"))
+					WarehouseWaybillStatusStrColor = GlobalConfig.GreenBrush;
+				else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
+					WarehouseWaybillStatusStrColor = GlobalConfig.YellowBrush;
+				else // if (str.Contains("待取号"))
+					WarehouseWaybillStatusStrColor = GlobalConfig.RedBrush;
+				// 状态边框颜色
+				if (str.Contains("已出库"))
+					WarehouseWaybillStatusBorderColor = GlobalConfig.GreenBrush75;
+				else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
+					WarehouseWaybillStatusBorderColor = GlobalConfig.YellowBrush75;
+				else // if (str.Contains("待取号"))
+					WarehouseWaybillStatusBorderColor = GlobalConfig.RedBrush75;
+				// 状态背景颜色
+				if (str.Contains("已出库"))
+					WarehouseWaybillStatusBackColor = GlobalConfig.GreenBrush35;
+				else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
+					WarehouseWaybillStatusBackColor = GlobalConfig.YellowBrush35;
+				else // if (str.Contains("待取号"))
+					WarehouseWaybillStatusBackColor = GlobalConfig.RedBrush35;
+			}
+		}
+
+		public Visibility TransitPackageLatestWarehouseStatusStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility); }
+			set { this.SetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility, value); }
+		}
+
+		public string TransitPackageLatestVoidStatusStr
+		{
+			get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStr); }
+			set { this.SetValue(x => x.TransitPackageLatestVoidStatusStr, value); TransitPackageLatestVoidStatusStrVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible;  }
+		}
+
+		public Visibility TransitPackageLatestVoidStatusStrVisibility
+		{
+			get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStrVisibility); }
+			set { this.SetValue(x => x.TransitPackageLatestVoidStatusStrVisibility, value); }
+		}
+
+		public string VoidPackageTypeStr
+		{
+			get { return this.GetValue(x => x.VoidPackageTypeStr); }
+			set { this.SetValue(x => x.VoidPackageTypeStr, value); }
+		}
+
+		///// <summary>
+		///// 订单对应店铺
+		///// </summary>
+		//public ShopLoginInfo Shop
+		//{
+		//    get { return this.GetValue(x => x.Shop); }
+		//    set { this.SetValue(x => x.Shop, value); }
 		//}
 
 		/// <summary>
@@ -38,7 +131,6 @@ namespace AllBase.Model.DBModel
 			set { this.SetValue(x => x.OrderItemVisibility, value); }
 		}
 
-
 		#region 订单采购参数
 		/// <summary>
 		/// 采购关联
@@ -889,7 +981,7 @@ namespace AllBase.Model.DBModel
 		}
 		public void SetTransitRefundStatusStr()
 		{
-			TransitRefundStatusStr = oms_wei_order_item_transit_info.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
+			TransitRefundStatusStr = oms_wei_order_item_transit_model.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
 
 			if (TransitRefundStatusStr.Contains("退款成功"))
 				TransitRefundStatusBackColor = GlobalConfig.GreenBrush;
@@ -1708,20 +1800,16 @@ namespace AllBase.Model.DBModel
 			}
 
 
-			//oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
-			//{
-			//	OrderItem = this,
-			//};
-			//TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
+			oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
+			{
+				OrderItem = this,
+			};
+			TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
 		}
 
 		/// <summary> 初始化物流明细信息 </summary>
 		public void SetEWaybillInfo()
 		{
-			if (order_id == "3738794693820307200")
-			{
-
-			}
 			if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
 				LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
 			else

AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs

@@ -1,6 +1,7 @@
 using AllBase.Helper;
 using AllBase.Model.MvvmBaseClasses;
 using NaiBa.Util.Extension;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,7 +14,7 @@ using System.Windows.Media;
 
 namespace AllBase.Model.DBModel;
 
-public class oms_wei_order_item_transit_info : PropertyNotifyObject
+public class oms_wei_order_item_transit_model : PropertyNotifyObject
 {
 	public oms_wei_order_item_info OrderItem
 	{
@@ -31,6 +32,13 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 		private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
 	}
 
+	private bool isGetLatestPackageInfo = false;
+
+	public oms_wei_order_item_transit_model (bool _isGetLatestPackage = false)
+	{
+		isGetLatestPackageInfo = _isGetLatestPackage;
+	}
+
 	void GetOrderItemTransitList()
 	{
 		List<oms_wei_order_item_transit_detail_info> transitDetailList =
@@ -62,11 +70,6 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 			{
 				var transitDetail = new oms_wei_order_item_transit_detail_info()
 				{
-					VoidPackageBtnVisibility = Visibility.Visible, /* 作废发货包裹按钮 */
-					RejectPackageBtnVisibility = Visibility.Visible, /* 拒收发货包裹按钮 */
-					ReturnPackageBtnVisibility = Visibility.Visible, /* 拦截退货包裹按钮 */
-					//ExtraPackagesBtnVisibility = Visibility.Visible, /* 额外发货包裹按钮 */
-
 					oms_wei_order_item_info = OrderItem,
 					oms_wei_external_procurement_log_info = transitOrder,
 
@@ -92,8 +95,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
 					BuyRefundStatus = transitOrder.refund_status,
 
+					CreateTime = transitOrder.created_time == DateTime.MinValue ? null : transitOrder.created_time,
 					PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
-					CreateTimeStr = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time.ToString("yyyy-MM-dd HH:mm:ss"),
 					InboundTime = transitOrder.inbound_time,
 					OutboundTime = transitOrder.outbound_time,
 
@@ -120,8 +123,10 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					transitDetail.TransitStatus = "创建中";
 
 				// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
-				if (transitOrder.warehouse_status == 0)
-					transitDetail.WarehouseStatus = "已创建";
+				if (transitOrder.pickup_time > DateTime.MinValue == false)
+					transitDetail.WarehouseStatus = "未取号";
+				else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "未入库";
 				else if (transitOrder.warehouse_status == 1)
 					transitDetail.WarehouseStatus = "已入库";
 				else if (transitOrder.warehouse_status == 2)
@@ -160,6 +165,43 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 
 				transitDetail.TransitDetailRefundStatusStr = GetTransitBuyerRefundStatusStr(OrderItem, transitOrder);
 
+				//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
+				//transitDetail.RejectPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
+				//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
+				//	!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+				//	!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+				//	Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
+				//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
+				//	!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+				//	!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+				//	Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
+				//transitDetail.ExtraPackagesBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-4)) &&
+				//	!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+				//	!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+				//	Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
+
+				transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
+				transitDetail.RejectPackageBtnVisibility = transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
+				transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) &&
+					!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+					!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+					Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
+				transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
+					!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+					!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+					Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
+				transitDetail.ExtraPackagesBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-4)) &&
+					!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
+					!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+					Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
+
+
+				//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废发货包裹按钮 */
+				//transitDetail.RejectPackageBtnVisibility = Visibility.Visible; /* 拒收发货包裹按钮 */
+				//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
+				//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
+				//transitDetail.ExtraPackagesBtnVisibility = Visibility.Visible; /* 额外发货包裹按钮 */
+
 				detailList.Add(transitDetail);
 			}
 			catch (Exception ex)
@@ -190,8 +232,6 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 				var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
 				var transitDetail = new oms_wei_order_item_transit_detail_info()
 				{
-					VoidPackageBtnVisibility = Visibility.Visible, /* 作废退货包裹 */
-
 					oms_wei_order_item_info = OrderItem,
 					oms_wei_external_procurement_after_sale_info = transitAftersaleOrder,
 
@@ -216,9 +256,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
 					BuyRefundStatus = transitOrder.refund_status,
 
-					// todo 退货包裹暂时缺少取号时间
-					PickUpTime = transitAftersaleOrder.pickup_time == DateTime.MinValue ? null : transitAftersaleOrder.pickup_time,
-					CreateTimeStr = transitAftersaleOrder.created_time == null ? null : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+					CreateTime = transitAftersaleOrder.created_time,
+					PickUpTime = transitAftersaleOrder.pickup_time,
 					InboundTime = transitAftersaleOrder.inbound_time,
 					OutboundTime = transitAftersaleOrder.outbound_time,
 
@@ -245,8 +284,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					transitDetail.TransitStatus = "异常";
 
 				// 退货包裹入库状态 1=入库 2=出库
-				if (transitAftersaleOrder.warehouse_status == 0)
-					transitDetail.WarehouseStatus = "已创建";
+				if (transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "未入库";
 				else if (transitAftersaleOrder.warehouse_status == 1)
 					transitDetail.WarehouseStatus = "已入库";
 				else if (transitAftersaleOrder.warehouse_status == 2)
@@ -260,9 +299,18 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 				//else if (transitOrder.order_void_status == 2)
 				//	transitDetail.TransitVoidStatus = "作废失败";
 
+
+				//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
+
+				transitDetail.VoidPackageBtnVisibility = (transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) && 
+					transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
+
+				//transitDetail.VoidPackageBtnVisibility = Visibility.Visible;
+
 				// 售后表没有拒收和拒收状态功能
 
-				// 售后表拦截成功状态在主表或者额外包裹表显示
+				// 售后表没有拦截和拦截状态功能
+				// 主表或者额外包裹表的售后状态在主表显示
 
 				detailList.Add(transitDetail);
 			}
@@ -318,8 +366,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'),
 					BuyRefundStatus = transitOrder.refund_status,
 
-					PickUpTime = transitExtraOrder.pickup_time == DateTime.MinValue ? null : transitExtraOrder.pickup_time,
-					CreateTimeStr = transitExtraOrder.created_time == null ? null : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+					CreateTime = transitExtraOrder.created_time,
+					PickUpTime = transitExtraOrder.pickup_time,
 					InboundTime = transitExtraOrder.inbound_time,
 					OutboundTime = transitExtraOrder.outbound_time,
 
@@ -346,8 +394,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 					transitDetail.TransitStatus = "处理中";
 
 				// 额外包裹入库状态 1=入库 2=出库
-				if (transitExtraOrder.warehouse_status == 0)
-					transitDetail.WarehouseStatus = "已创建";
+				if (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "未入库";
 				else if (transitExtraOrder.warehouse_status == 1)
 					transitDetail.WarehouseStatus = "已入库";
 				else if (transitExtraOrder.warehouse_status == 2)
@@ -386,6 +434,27 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 				else if (transitAfterSaleOrder != null && transitExtraOrder.intercept_return_status == 2)
 					transitDetail.TransitReturnStatus = "拦截失败";
 
+				//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
+				//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
+				//	transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+				//	Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
+				//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
+				//	transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+				//	Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
+
+				transitDetail.VoidPackageBtnVisibility = !(transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) && 
+					transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
+				transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
+					transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+					Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
+				transitDetail.InterceptPackageBtnVisibility = transitExtraOrder.warehouse_status == 2 &&
+					transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
+					Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
+
+				//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废额外包裹 */
+				//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
+				//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
+
 				detailList.Add(transitDetail);
 			}
 			catch (Exception ex)
@@ -422,6 +491,9 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 	}
 }
 
+/// <summary>
+/// 包裹相关信息
+/// </summary>
 public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 {
 	public oms_wei_order_item_transit_detail_info()
@@ -430,13 +502,14 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		VoidPackageBtnVisibility = Visibility.Collapsed;
 		RejectPackageBtnVisibility = Visibility.Collapsed;
 		ReturnPackageBtnVisibility = Visibility.Collapsed;
+		InterceptPackageBtnVisibility = Visibility.Collapsed;
 		ExtraPackagesBtnVisibility = Visibility.Collapsed;
 	}
 
 	public oms_wei_order_item_info oms_wei_order_item_info { get; set; }
-	public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; }
-	public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; }
-	public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; }
+	public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; } /* 发货包裹 */
+	public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; } /* 退货包裹 */
+	public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; } /* 额外包裹 */
 
 	public decimal Opacity
 	{
@@ -450,9 +523,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		set { this.SetValue(x => x.ShopName, value); }
 	}
 
-	/// <summary>
-	/// 仓库类型 发货包裹 退货包裹
-	/// </summary>
+	/// <summary> 仓库类型: 发货包裹 退货包裹 额外包裹 </summary>
 	public string TransitTypeStr
 	{
 		get { return this.GetValue(x => x.TransitTypeStr); }
@@ -493,6 +564,11 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.WarehouseName); }
 		set { this.SetValue(x => x.WarehouseName, value); }
 	}
+	public DateTime? CreateTime
+	{
+		get { return this.GetValue(x => x.CreateTime); }
+		set { this.SetValue(x => x.CreateTime, value); CreateTimeStr = value == null ? null : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
+	}
 	public string CreateTimeStr
 	{
 		get { return this.GetValue(x => x.CreateTimeStr); }
@@ -568,7 +644,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.TransitStatus); }
 		set { this.SetValue(x => x.TransitStatus, value); }
 	}
-	/// <summary> 仓库状态 </summary>
+	/// <summary> 仓库状态文本: 未入库 已入库 已出库 拦截到仓</summary>
 	public string WarehouseStatus
 	{
 		get { return this.GetValue(x => x.WarehouseStatus); }
@@ -663,11 +739,22 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.RejectPackageBtnVisibility); }
 		set { this.SetValue(x => x.RejectPackageBtnVisibility, value); }
 	}
+	/// <summary>
+	/// 直接退回包裹
+	/// </summary>
 	public Visibility ReturnPackageBtnVisibility
 	{
 		get { return this.GetValue(x => x.ReturnPackageBtnVisibility); }
 		set { this.SetValue(x => x.ReturnPackageBtnVisibility, value); }
 	}
+	/// <summary>
+	/// 拦截退回包裹
+	/// </summary>
+	public Visibility InterceptPackageBtnVisibility
+	{
+		get { return this.GetValue(x => x.InterceptPackageBtnVisibility); }
+		set { this.SetValue(x => x.InterceptPackageBtnVisibility, value); }
+	}
 	public Visibility ExtraPackagesBtnVisibility
 	{
 		get { return this.GetValue(x => x.ExtraPackagesBtnVisibility); }

AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs

@@ -77,7 +77,10 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
 	public int? postage { get; set; } // '订单初始费用（分）',
 	public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败',
 	public int? over_weight_fee { get; set; } // '超重费用',
-	public string pack_type { get; set; } // '中转仓额外包裹类型 1商品2额外3礼品4退货',
+	/// <summary>
+	/// 中转仓额外包裹类型 1商品2额外3礼品4退货
+	/// </summary>
+	public string pack_type { get; set; }
 	public DateTime? rejected_time { get; set; } // '拒收时间',
 	public int? has_reject { get; set; } // DEFAULT NULL,
 	public DateTime? blocked_arrival_time { get; set; }