中转仓补发包裹

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -157,6 +157,11 @@ namespace AllBase.Model.DBModel
 			get { return this.GetValue(x => x.IsShowChangeWaybillBtn); }
 			set { this.SetValue(x => x.IsShowChangeWaybillBtn, value); }
 		}
+		public bool IsShowTransitExtraPackagesBtn
+		{
+			get { return this.GetValue(x => x.IsShowTransitExtraPackagesBtn); }
+			set { this.SetValue(x => x.IsShowTransitExtraPackagesBtn, value); }
+		}
 
 		public string orderStatusStr
 		{
@@ -744,6 +749,11 @@ namespace AllBase.Model.DBModel
 				IsShowChangeWaybillBtn = false;
 			else
 				IsShowChangeWaybillBtn = true;
+
+			if (IsWaitBuy)
+				IsShowTransitExtraPackagesBtn = false;
+			else
+				IsShowTransitExtraPackagesBtn = true;
 		}
 
 		public bool GetIsWaitBuy()

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -218,8 +218,44 @@ namespace AllBase.Model.DBModel
         {
             get { return this.GetValue(x => x.ItemTransitOrderAfterSale); }
             set { this.SetValue(x => x.ItemTransitOrderAfterSale, value); }
-        }
-        public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
+		}
+		public List<oms_wei_transfer_extra_package> ItemTransitExtraOrders
+		{
+			get { return this.GetValue(x => x.ItemTransitExtraOrders); }
+			set { this.SetValue(x => x.ItemTransitExtraOrders, value); }
+		}
+		public oms_wei_transfer_extra_package ItemTransitExtraOrder
+		{
+			get { return this.GetValue(x => x.ItemTransitExtraOrder); }
+			set
+			{
+				if (order_id == "3739278903964250368")
+				{
+					
+				}
+				this.SetValue(x => x.ItemTransitExtraOrder, value);
+				if (ItemTransitExtraOrder != null)
+				{
+					if (ItemTransitExtraOrder.real_logistics_code.IsNullOrEmpty())
+					{
+						ItemTransitExtraOrder.real_logistics_code = "滞留补发处理中";
+					}
+				}
+				TransitExtraPackageWaybillStr = (ItemTransitExtraOrder?.real_logistics_code + "-" + ItemTransitExtraOrder?.real_logistics_express_code).Trim('-');
+				TransitExtraPackageWaybillBtnStr = ItemTransitExtraOrder?.order_void_status == 1 ? "已作废" : "作废";
+			}
+		}
+		public string TransitExtraPackageWaybillStr
+		{
+			get { return this.GetValue(x => x.TransitExtraPackageWaybillStr); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); }
+		}
+		public string TransitExtraPackageWaybillBtnStr
+		{
+			get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStr); }
+			set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); }
+		}
+		public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
         public order_pdd_buyer_order PddBuyerOrder
         {
             get { return this.GetValue(x => x.PddBuyerOrder); }
@@ -258,6 +294,9 @@ namespace AllBase.Model.DBModel
 			}
 			this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
 			this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
+
+			this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault();
+
 			this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
 			this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
 			// 优先找非撤销买手退款单
@@ -883,6 +922,14 @@ namespace AllBase.Model.DBModel
 				}
 				this.SetValue(x => x.DirectPddBuyerOrder, value);
 				SyncLogisticsMsg = DirectPddBuyerOrder?.sync_logistics_msg;
+				// 有单号就不显示错误，否则单号字段显示错误信息
+				if (ItemOrder.SyncWaybillId.IsNullOrEmpty())
+				{
+					ItemOrder.SyncWaybillId = SyncLogisticsMsg;
+					SyncLogisticsMsg = "";
+				}
+				else
+					SyncLogisticsMsg = "";
 			}
 		}
 		public string SyncLogisticsMsg

AllBase/Model/DBModel/oms_wei_transfer_extra_package.cs

@@ -0,0 +1,51 @@
+using AllBase.Model.MvvmBaseClasses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel;
+
+public class oms_wei_transfer_extra_package : PropertyNotifyObject
+{
+	public long id { get; set; } // 主键ID
+	public string batchId { get; set; } // 新订单号
+	public string order_no { get; set; } // 平台订单号
+	public string buyer_account { get; set; } // '买家账号',
+	public int? out_amount { get; set; } // '外部金额（分）',
+	public string purchaser_note { get; set; } // '采购人备注'
+	public string logistics_code { get; set; } // '快递公司',
+	public string logistics_express_code { get; set; } // '快递单号',
+	public string real_logistics_code // '出库快递公司',
+	{
+		get { return this.GetValue(x => x.real_logistics_code); }
+		set { this.SetValue(x => x.real_logistics_code, value); }
+	} 
+	public string real_logistics_express_code // '出库单号',
+	{
+		get { return this.GetValue(x => x.real_logistics_express_code); }
+		set { this.SetValue(x => x.real_logistics_express_code, value); }
+	} 
+	public string refund_status { get; set; } // '买手退款状态',
+	public DateTime? pickup_time { get; set; } // '取号时间',
+	public int? transfer_warehouse_status { get; set; } // '中转仓状态：0 未使用，1 已创建，2 创建失败',
+	public string raw_message { get; set; } // '原始消息/请求体',
+	public DateTime? created_time { get; set; } // '创建时间',
+	public DateTime? updated_time { get; set; } // '更新时间',
+	public string platform { get; set; } // '中转仓库编码',
+	public string order_platform_code { get; set; } // '订单平台',
+	public string order_code { get; set; } // '唯一值编码',
+	public string random_code { get; set; } // '溯源码',
+	public int? warehouse_status { get; set; } // '0: 未使用, 1: 已入库, 2: 未入库',
+	public DateTime? inbound_time { get; set; } // '入库时间',
+	public DateTime? outbound_time { get; set; } // '出库时间',
+	public int? order_void_status { get; set; } // '订单作废状态：0=正常，1=已作废，2=作废失败',
+	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退货',
+	public DateTime? rejected_time { get; set; } // '拒收时间',
+	public int? has_reject { get; set; } // DEFAULT NULL,
+	public DateTime? blocked_arrival_time { get; set; }
+}