Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder

2026-10-27 17:44:45 +08:00
commit f89670877d
@@ -399,111 +399,96 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls

 				}

-                //if (data1.Contains("260415-154067299863696") || data1.Contains("待用户退回商品") || data1.Contains("已寄出，待商家处理") || data1.Contains("待商家处理退货申请") || data1.Contains("待用户拒收商品"))
-                //{
+				//if (data1.Contains("260415-154067299863696") || data1.Contains("待用户退回商品") || data1.Contains("已寄出，待商家处理") || data1.Contains("待商家处理退货申请") || data1.Contains("待用户拒收商品"))
+				//{

-                //}
+				//}

-                // 已发货 第一页
-                if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3")) //https://mobile.yangkeduo.com/orders.html?type=3
-                {
-                    await Task.Run(() =>
-                    {
-                        if (data1.Contains("display_amount"))
-                        {
-                            var jsonData = BaseRegex.GetJsonObjStrJson(ref data1, "ordersStore")?.FirstOrDefault();
-                            var nickName = BaseRegex.GetStringJson(ref data1, "nickName");
-                            var uid = BaseRegex.GetStringJson(ref data1, "uid");
-                            var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
-                            if (buyerId.IsNullOrEmpty())
-                                buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id;
-                            if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(buyerId))
-                            {
-                                var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault();
-                                if (ordersStr != null && ordersStr.StartsWith("{\"3\":"))
-                                {
-                                    ordersStr = "{\"orders\":" + ordersStr.Substring(5);
-                                    CefReadBuyerOrder(buyerId, ordersStr);
-                                }
-                            }
-                        }
-                    });
-                }
-                // 待发货 第一页
-                if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=2"))
-                {
-                    await Task.Run(() =>
-                    {
-                        if (data1.Contains("display_amount"))
-                        {
-                            var jsonData = BaseRegex.GetJsonObjStrJson(ref data1, "ordersStore")?.FirstOrDefault();
-                            var nickName = BaseRegex.GetStringJson(ref data1, "nickName");
-                            var uid = BaseRegex.GetStringJson(ref data1, "uid");
-                            var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
-                            if (buyerId.IsNullOrEmpty())
-                                buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id;
-                            if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(buyerId))
-                            {
-                                var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault();
-                                if (ordersStr != null && ordersStr.StartsWith("{\"2\":"))
-                                {
-                                    ordersStr = "{\"orders\":" + ordersStr.Substring(5);
-                                    CefReadBuyerOrder(buyerId, ordersStr);
-                                }
-                            }
-                        }
-                    });
-                }
+				// 已发货 第一页
+				if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3")) //https://mobile.yangkeduo.com/orders.html?type=3
+				{
+					if (data1.Contains("display_amount"))
+					{
+						var jsonData = BaseRegex.GetJsonObjStrJson(ref data1, "ordersStore")?.FirstOrDefault();
+						var nickName = BaseRegex.GetStringJson(ref data1, "nickName");
+						var uid = BaseRegex.GetStringJson(ref data1, "uid");
+						var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
+						if (buyerId.IsNullOrEmpty())
+							buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id;
+						if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(buyerId))
+						{
+							var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault();
+							if (ordersStr != null && ordersStr.StartsWith("{\"3\":"))
+							{
+								ordersStr = "{\"orders\":" + ordersStr.Substring(5);
+								await CefReadBuyerOrder(buyerId, ordersStr);
+							}
+						}
+					}
+				}
+				// 待发货 第一页
+				if (url1.StartsWith("https://mobile.yangkeduo.com/orders.html?type=2"))
+				{
+					if (data1.Contains("display_amount"))
+					{
+						var jsonData = BaseRegex.GetJsonObjStrJson(ref data1, "ordersStore")?.FirstOrDefault();
+						var nickName = BaseRegex.GetStringJson(ref data1, "nickName");
+						var uid = BaseRegex.GetStringJson(ref data1, "uid");
+						var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
+						if (buyerId.IsNullOrEmpty())
+							buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id;
+						if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(buyerId))
+						{
+							var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault();
+							if (ordersStr != null && ordersStr.StartsWith("{\"2\":"))
+							{
+								ordersStr = "{\"orders\":" + ordersStr.Substring(5);
+								await CefReadBuyerOrder(buyerId, ordersStr);
+							}
+						}
+					}
+				}
 				
 				// 读订单
 				if (/*(cefAddress.Contains("orders.html")) &&*/ url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v")) //https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v4?pdduid=6766109923730
 				{
-					await Task.Run(() =>
-                    {
-                        CefReadBuyerOrder(url1, data1);
-                    });
+                    await CefReadBuyerOrder(url1, data1);
                }

-                // 售后 第一页
-                if (url1.StartsWith("https://mobile.yangkeduo.com/complaint_list.html"))
-                {
-                    await Task.Run(() =>
-                    {
-						if (data1.Contains("listItemStatusVo") && data1.Contains("afterSalesId") && data1.Contains("statusText"))
-                        {
-                            var cookie2 = cookie1.Replace(";", "&").Replace(" ", "");
-                            var jsonDatas = BaseRegex.GetJsonObjStrJson(ref data1, "listDataMap");
-                            var jsonData = jsonDatas?.OrderByDescending(x => x.Length).FirstOrDefault();
-                            var uid = BaseRegex.GetStringQuery(ref cookie2, "pdd_user_id");
-                            var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
-                            if (!string.IsNullOrEmpty(buyerId) && !string.IsNullOrEmpty(jsonData))
-                            {
-                                try
-								{
-									var jObj = JsonHelper.JObjectParse(jsonData);
-                                    jObj["result"] = jObj["all"];
-                                    jObj["result"]["listItemVOList"] = jObj["result"]["list"];
+				// 售后 第一页
+				if (url1.StartsWith("https://mobile.yangkeduo.com/complaint_list.html"))
+				{
+					if (data1.Contains("listItemStatusVo") && data1.Contains("afterSalesId") && data1.Contains("statusText"))
+					{
+						var cookie2 = cookie1.Replace(";", "&").Replace(" ", "");
+						var jsonDatas = BaseRegex.GetJsonObjStrJson(ref data1, "listDataMap");
+						var jsonData = jsonDatas?.OrderByDescending(x => x.Length).FirstOrDefault();
+						var uid = BaseRegex.GetStringQuery(ref cookie2, "pdd_user_id");
+						var buyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == uid)?.buyer_id;
+						if (!string.IsNullOrEmpty(buyerId) && !string.IsNullOrEmpty(jsonData))
+						{
+							try
+							{
+								var jObj = JsonHelper.JObjectParse(jsonData);
+								jObj["result"] = jObj["all"];
+								jObj["result"]["listItemVOList"] = jObj["result"]["list"];

-									var nextQueryCreatedAt = BaseRegex.GetStringJson(ref data1, "nextQueryCreatedAt");
-									jObj["result"]["nextQueryCreatedAt"] = nextQueryCreatedAt;
+								var nextQueryCreatedAt = BaseRegex.GetStringJson(ref data1, "nextQueryCreatedAt");
+								jObj["result"]["nextQueryCreatedAt"] = nextQueryCreatedAt;

-									CefReadBuyerAfterSale(buyerId, JsonHelper.SerializeObject(jObj));
-                                }
-                                catch
-                                {
+								await CefReadBuyerAfterSale(buyerId, JsonHelper.SerializeObject(jObj));
+							}
+							catch
+							{

-                                }
-                            }
-                        }
-                    });
-                }
+							}
+						}
+					}
+				}
 				// 读取售后
 				if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/blade/after_sales_list"))
                {
-                    await Task.Run(() =>
-                    {
-                        CefReadBuyerAfterSale(url1, data1);
-                    });
+                    await CefReadBuyerAfterSale(url1, data1); 
                }
            });
        }
@@ -717,7 +702,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
            pdd_afterSale.AfterSaleAddress = buyer_after_sale?.afterSaleAddress;
        }

-        void CefReadBuyerOrder(string url, string data)
+		async Task CefReadBuyerOrder(string url, string data)
        {
            if (data.Contains("轻奢壁挂式香皂盒置物架卫生间沥水家居可拆卸收纳盒翻盖肥皂盒"))
            {
@@ -964,7 +949,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                    }));
                }

-                Task.Run(() =>
+                await Task.Run(() =>
                {
                    // 根据订单状态 取号/修改取号
                    if (order.WxSendTypeStr == "直发")
@@ -1090,7 +1075,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
            NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
        }

-        void CefReadBuyerAfterSale(string url, string data)
+        async Task CefReadBuyerAfterSale(string url, string data)
        {
            var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => url.Contains(b.buyer_id));
            if (buyer == null)
@@ -1341,10 +1341,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 							isOnsale = 1,
 							spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异，包含冒号与父类型id
 							specs = pddSpecs,
-							price = tbSku2.price.priceMoney.ParseToInt() + 100,
-							normalPrice = ((tbSku2.price.priceMoney.ParseToInt() + 100) / 100m).ToString("F2"),
-							groupPrice = tbSku2.price.priceText,
-							oldGroupPrice = tbSku2.price.priceMoney.ParseToInt(),
+							price = tbSku2.price?.priceMoney.ParseToInt() + 100,
+							normalPrice = ((tbSku2.price?.priceMoney.ParseToInt() + 100) / 100m).ParseToDecimal().ToString("F2"),
+							groupPrice = tbSku2.price?.priceText,
+							oldGroupPrice = tbSku2.price?.priceMoney.ParseToInt(),
 						};
 						pddFrontGoods3.skus.Add(pddFrontSkuInfo);
 					}
@@ -660,9 +660,17 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls

 				oList.Add(o);

+                if (o.order_sn == "tb_5127890185262007919")
+                {
+
+                }
 				// 售后单放在同一个列表中统一处理
 				var refundStatus = BaseRegex.GetStringJson(ref orderItemInfoStr, "refundStatus");
-				if (!string.IsNullOrEmpty(refundStatus) && !string.IsNullOrEmpty(orderStatus))
+				if (refundStatus.IsNullOrEmpty())
+				{
+					refundStatus = BaseRegex.GetStringJson(ref shopInfoStr, "tradeTitle") == "交易关闭" ? "退款成功" : "";
+				}
+				if ((!string.IsNullOrEmpty(refundStatus) && !string.IsNullOrEmpty(orderStatus)) || refundStatus == "退款成功")
 				{
 					TbBuyerAfterSaleLiteInfo af = new TbBuyerAfterSaleLiteInfo();
 					af.buyerId = o.buyerId;
@@ -769,7 +777,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                o.buyerId = buyer.buyer_id;
                o.buyerName = buyer.buyer_name;

-                if (o.order_sn == "tb_5127796188031004903")
+                if (o.order_sn == "tb_5127890185262007919")
                {

                }
@@ -609,7 +609,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					}
 				}

-				disPlayOrderTabOrderCount();
+				if (page % 5 == 1 || page >= totalPage)
+					disPlayOrderTabOrderCount();
 			}

 			// 处理店铺后台物流异常单
@@ -1144,6 +1145,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				if (shop.LoginStatus != "登录成功")
 					continue;

+				// 查询异常订单
 				var rst = WxSimAbnormalOrderSeach(shop, 100);
 				//Thread.Sleep(Randomx.GetId(50, 150));
 				if (rst.Contains("\"code\":0"))
@@ -1268,7 +1270,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 						BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + ex.Message, "Error", 5);
 					}
 				}
-				disPlayOrderTabOrderCount();
+				if (index % 5 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
+					disPlayOrderTabOrderCount();
 			}
 		}

@@ -1374,7 +1374,6 @@
 			</wpf:SpacingStackPanel>
 			<!--  操作  -->

-
 			<wpf:SpacingStackPanel
 				Grid.Column="8"
 				HorizontalAlignment="Right"
@@ -1392,99 +1391,94 @@
 					Orientation="Vertical"
 					VerticalSpacing="6">

+					<Button
+						x:Name="btnTransitInfo"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						Click="btnTransitInfo_Click"
+						Content="云仓详情"
+						Style="{StaticResource BasePageButtonLightStyle}" />

-					<wpf:TitleContent>
-						<Button
-							x:Name="btnMapSkus"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							Click="btnMapSkus_Click"
-							Content="选择SKU"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding MapSkusBtnVisibility}" />
-					</wpf:TitleContent>
+					<Button
+						x:Name="btnMapSkus"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						Click="btnMapSkus_Click"
+						Content="选择SKU"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding MapSkusBtnVisibility}" />

-					<wpf:TitleContent>
-						<Button
-							x:Name="btnBuyOrder"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							d:Background="{StaticResource pageColorLightBrush}"
-							d:BorderBrush="{StaticResource pageColorBrush}"
-							d:Content="拍　　单"
-							d:Foreground="{StaticResource pageColorBrush}"
-							d:Visibility="Visible"
-							Background="{Binding BuyGoodsBtnBackColor}"
-							BorderBrush="{Binding BuyGoodsBtnColor}"
-							Click="btnBuyOrder_Click"
-							Content="{Binding BuyGoodsBtnTxt}"
-							Foreground="{Binding BuyGoodsBtnColor}"
-							IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
+					<Button
+						x:Name="btnBuyOrder"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						d:Background="{StaticResource pageColorLightBrush}"
+						d:BorderBrush="{StaticResource pageColorBrush}"
+						d:Content="拍　　单"
+						d:Foreground="{StaticResource pageColorBrush}"
+						d:Visibility="Visible"
+						Background="{Binding BuyGoodsBtnBackColor}"
+						BorderBrush="{Binding BuyGoodsBtnColor}"
+						Click="btnBuyOrder_Click"
+						Content="{Binding BuyGoodsBtnTxt}"
+						Foreground="{Binding BuyGoodsBtnColor}"
+						IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />

-					</wpf:TitleContent>
-					<wpf:TitleContent>
-						<Button
-							x:Name="btnVoidTransitOrder"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							d:Visibility="Visible"
-							Click="btnVoidTransitOrder_Click"
-							Content="作废重拍"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding BtnVoidTransitOrderVisibility}" />
-					</wpf:TitleContent>
-
-					<wpf:TitleContent>
-						<Button
-							x:Name="btnAbnormalOrderRebuy"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							d:Visibility="Visible"
-							Click="btnAbnormalOrderRebuy_Click"
-							Content="异常重拍"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
-					</wpf:TitleContent>
+					<Button
+						x:Name="btnVoidTransitOrder"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						d:Visibility="Visible"
+						Click="btnVoidTransitOrder_Click"
+						Content="作废重拍"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding BtnVoidTransitOrderVisibility}" />

+					<Button
+						x:Name="btnAbnormalOrderRebuy"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						d:Visibility="Visible"
+						Click="btnAbnormalOrderRebuy_Click"
+						Content="异常重拍"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />

 					<!--  直发拍单  -->
-					<wpf:TitleContent>
-						<Button
-							x:Name="btnDirectBuyOrder"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							Click="btnDirectBuyOrder_Click"
-							Content="直发拍单"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding BtnDirectBuyOrderVisibility}" />
-					</wpf:TitleContent>
+					<Button
+						x:Name="btnDirectBuyOrder"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						Click="btnDirectBuyOrder_Click"
+						Content="直发拍单"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding BtnDirectBuyOrderVisibility}" />

 					<!--  礼品发货  -->
-					<wpf:TitleContent>
-						<Button
-							x:Name="btnShipGift"
-							Height="22"
-							MinWidth="38"
-							Margin="0,0,0,0"
-							HorizontalAlignment="Center"
-							d:Visibility="Visible"
-							Click="btn_ShipGiftCommand"
-							Content="礼品发货"
-							Style="{StaticResource BasePageButtonLightStyle}"
-							Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
-					</wpf:TitleContent>
+					<Button
+						x:Name="btnShipGift"
+						Height="22"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						HorizontalAlignment="Center"
+						Click="btn_ShipGiftCommand"
+						Content="礼品发货"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
 				</wpf:SpacingStackPanel>

 				<wpf:SpacingStackPanel
@@ -2135,7 +2135,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls

 		private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
 		{
-			return;
+		}
+
+		private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
+		{
+			//return;
 			if (this.DataContext is oms_wei_order_item_info orderItem)
 			{
 				oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
@@ -1,167 +1,290 @@
 <UserControl
-    x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wpf="WPFCommon"
-    d:DesignHeight="280"
-    d:DesignWidth="800"
-    Background="White"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
-            <Setter Property="Placement" Value="Left" />
-            <Setter Property="TitleVerticalAlignment" Value="Center" />
-            <Setter Property="LeftTitlePadding" Value="0,0,0,0" />
-        </Style>
-        <Style TargetType="wpf:SpacingStackPanel">
-            <Setter Property="Margin" Value="3,0" />
-        </Style>
-    </UserControl.Resources>
-    <Border
-        MinHeight="50"
-        Margin="5"
-        BorderBrush="SkyBlue"
-        BorderThickness="1"
-        CornerRadius="10">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
-                <StackPanel MinHeight="30" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="仓库订单号" />
-                    <TextBox
-                        VerticalContentAlignment="Center"
-                        d:Text="261008-123456789012345"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="DimGray"
-                        IsReadOnly="True"
-                        Text="{Binding OrderCode}" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        d:Text="仓库类型"
-                        Text="{Binding TransitTypeStr}" />
-                    <TextBox
-                        VerticalContentAlignment="Center"
-                        d:Text="261008-123456789012345"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="DimGray"
-                        IsReadOnly="True"
-                        Text="{Binding SourceCode}" />
-                </StackPanel>
-            </Border>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Border
-                    Margin="0,10"
-                    BorderBrush="LightSkyBlue"
-                    BorderThickness="0,0,1,0"
-                    Opacity="0.5">
-                    <wpf:SpacingStackPanel
-                        Margin="10,10"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical"
-                        VerticalSpacing="4">
-                        <wpf:TitleContent Title="交易单号：">
-                            <TextBox
-                                d:Text="371234567890123456"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding WxOrderId}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                        <wpf:TitleContent Title="买手单号：">
-                            <TextBox
-                                d:Text="261008-1234567890123456"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding OutOrderId}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                        <wpf:TitleContent Title="下单时间：">
-                            <TextBox
-                                d:Text="26-10-07 10:33:33"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding WxOrderCreateTimeStr}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                        <wpf:TitleContent Title="取号时间：">
-                            <TextBox
-                                d:Text="26-10-08 00:33:33"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding PickUpTimeStr}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                    </wpf:SpacingStackPanel>
-                </Border>
-                <Border
-                    Grid.Column="1"
-                    Margin="0,10"
-                    BorderBrush="LightSkyBlue"
-                    BorderThickness="0,0,1,0"
-                    Opacity="0.5">
-                    <wpf:SpacingStackPanel
-                        Margin="10,10"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical"
-                        VerticalSpacing="4">
-                        <wpf:TitleContent
-                            Title="{Binding WarehouseName}"
-                            d:Title="上海仓"
-                            FontWeight="Bold">
-                            <TextBox
-                                d:Text="已出仓"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                FontWeight="Normal"
-                                IsReadOnly="True"
-                                Text="{Binding WxOrderId}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                        <wpf:TitleContent Title="入库单号：">
-                            <TextBox
-                                d:Text="JTSD-JT12345678901122"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding PickUpTimeStr}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                        <wpf:TitleContent Title="出库单号：">
-                            <TextBox
-                                d:Text="YD-3111111555555123"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                IsReadOnly="True"
-                                Text="{Binding PickUpTimeStr}"
-                                TextWrapping="Wrap" />
-                        </wpf:TitleContent>
-                    </wpf:SpacingStackPanel>
-                </Border>
+	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:wpf="WPFCommon"
+	d:DesignHeight="280"
+	d:DesignWidth="1000"
+	Background="White"
+	mc:Ignorable="d">
+	<UserControl.Resources>
+		<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
+			<Setter Property="Placement" Value="Left" />
+			<Setter Property="TitleVerticalAlignment" Value="Center" />
+			<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
+		</Style>
+		<Style TargetType="wpf:SpacingStackPanel">
+			<Setter Property="Margin" Value="3,0" />
+		</Style>
+	</UserControl.Resources>
+	<Border
+		MinHeight="50"
+		Margin="5"
+		BorderBrush="SkyBlue"
+		BorderThickness="1"
+		CornerRadius="10">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="auto" />
+				<RowDefinition Height="*" />
+			</Grid.RowDefinitions>
+			<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
+				<StackPanel MinHeight="30" Orientation="Horizontal">
+					<TextBlock
+						Margin="10,0,0,0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="仓库订单号" />
+					<TextBox
+						VerticalContentAlignment="Center"
+						d:Text="261008-123456789012345"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="DimGray"
+						IsReadOnly="True"
+						Text="{Binding OrderCode}" />
+					<TextBlock
+						Margin="10,0,0,0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						d:Text="发货包裹"
+						Text="{Binding TransitTypeStr}" />
+					<TextBox
+						VerticalContentAlignment="Center"
+						d:Text="ABCDEF1"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="DimGray"
+						IsReadOnly="True"
+						Text="{Binding SourceCode}" />
+				</StackPanel>
+			</Border>
+			<Grid Grid.Row="1">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="0.7*" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Border
+					Margin="0,10"
+					BorderBrush="LightSkyBlue"
+					BorderThickness="0,0,1,0"
+					Opacity="0.5">
+					<wpf:SpacingStackPanel
+						Margin="10,10"
+						VerticalAlignment="Center"
+						Orientation="Vertical"
+						VerticalSpacing="4">
+						<wpf:TitleContent Title="交易单号：">
+							<TextBox
+								d:Text="371234567890123456"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding WxOrderId}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="买手单号：">

-            </Grid>
-        </Grid>
-    </Border>
+							<TextBox
+								d:Text="261008-1234567890123456"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding OutOrderId}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="下单时间：">
+							<TextBox
+								d:Text="26-10-07 10:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding WxOrderCreateTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="添加时间：">
+							<TextBox
+								d:Text="26-10-07 18:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding TransitAddTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="创建时间：">
+							<TextBox
+								d:Text="26-10-08 00:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding CreateTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<!--<wpf:TitleContent Title="店铺名称：">
+							<TextBox
+								d:Text="芥麦亚"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding ShopName}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>-->
+					</wpf:SpacingStackPanel>
+				</Border>
+				<Border
+					Grid.Column="1"
+					Margin="0,10"
+					BorderBrush="LightSkyBlue"
+					BorderThickness="0,0,1,0"
+					Opacity="0.5">
+					<wpf:SpacingStackPanel
+						Margin="10,10"
+						VerticalAlignment="Center"
+						Orientation="Vertical"
+						VerticalSpacing="4">
+						<wpf:TitleContent
+							Title="{Binding WarehouseName}"
+							d:Title="上海仓"
+							FontWeight="Bold">
+							<WrapPanel>
+								<TextBox
+									d:Text="已出仓"
+									Background="Transparent"
+									BorderThickness="0"
+									FontWeight="Normal"
+									IsReadOnly="True"
+									Text="{Binding WarehouseStatus}"
+									TextWrapping="Wrap" />
+							</WrapPanel>
+
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="入库单号：">
+							<TextBox
+								d:Text="JTSD-JT12345678901122"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding UpperWaybill}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="出库单号：">
+							<TextBox
+								d:Text="YD-3111111555555123"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding DownWaybill}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="货架号：">
+							<TextBox
+								d:Text="EB3021"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding ShelfCodeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="货架记录时间：">
+							<TextBox
+								d:Text="26-10-08 00:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding ShelfTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+					</wpf:SpacingStackPanel>
+				</Border>
+				<Border
+					Grid.Column="2"
+					Margin="0,10"
+					BorderBrush="LightSkyBlue"
+					BorderThickness="0,0,1,0"
+					Opacity="0.5">
+					<wpf:SpacingStackPanel
+						Margin="10,10"
+						VerticalAlignment="Center"
+						Orientation="Vertical"
+						VerticalSpacing="4">
+						<wpf:TitleContent Title="作废状态：" FontWeight="Bold">
+							<TextBox
+								d:Text="已作废"
+								Background="Transparent"
+								BorderThickness="0"
+								FontWeight="Normal"
+								IsReadOnly="True"
+								Text="{Binding TransitVoidStatus}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="拒收状态：" FontWeight="Bold">
+							<TextBox
+								d:Text="拒收失败"
+								Background="Transparent"
+								BorderThickness="0"
+								FontWeight="Normal"
+								IsReadOnly="True"
+								Text="{Binding TransitRejectStatus}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="拦截状态：" FontWeight="Bold">
+							<TextBox
+								d:Text="已拦截"
+								Background="Transparent"
+								BorderThickness="0"
+								FontWeight="Normal"
+								IsReadOnly="True"
+								Text="{Binding TransitReturnStatus}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+					</wpf:SpacingStackPanel>
+				</Border>
+				<Border
+					Grid.Column="3"
+					Margin="0,10"
+					BorderBrush="LightSkyBlue"
+					BorderThickness="0,0,1,0"
+					Opacity="0.5">
+					<wpf:SpacingStackPanel
+						Margin="10,10"
+						VerticalAlignment="Center"
+						Orientation="Vertical"
+						VerticalSpacing="4">
+						<wpf:TitleContent Title="到仓时间：">
+							<TextBox
+								d:Text="26-10-07 10:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding InboundTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="取号时间：">
+							<TextBox
+								d:Text="26-10-08 00:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding PickUpTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+						<wpf:TitleContent Title="出仓时间：">
+							<TextBox
+								d:Text="26-10-07 10:33:33"
+								Background="Transparent"
+								BorderThickness="0"
+								IsReadOnly="True"
+								Text="{Binding OutboundTimeStr}"
+								TextWrapping="Wrap" />
+						</wpf:TitleContent>
+					</wpf:SpacingStackPanel>
+				</Border>
+			</Grid>
+		</Grid>
+	</Border>
 </UserControl>
@@ -30,8 +30,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
    public partial class TransitAfterSaleWindow : BaseWindow
    {
        public oms_wei_order_item_info OrderItem { get; set; }
+		public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;

-        public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
+		public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
        {
            InitializeComponent();

@@ -54,9 +55,34 @@ namespace _29WxOrderWpf.Windows.OrderWindows

            if (OrderItem != null)
            {
-				this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName;
-                this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company ?? OrderItem.ItemTransitOrderWithVoid?.express_2_company;
-                this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill ?? OrderItem.ItemTransitOrderWithVoid?.express_2_waybill;
+				if (TransitOrder == null)
+				{
+					if (OrderItem.ItemTransitOrder != null)
+						TransitOrder = OrderItem.ItemTransitOrder;
+					else
+						TransitOrder = OrderItem.ItemTransitOrderWithVoid;
+				}
+				this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
+                this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
+                this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
+				if (TransitOrder != null && (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty()))
+				{
+					this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
+					this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
+
+					if (!string.IsNullOrWhiteSpace(this.txtExpressName.Text) && !string.IsNullOrWhiteSpace(this.txtWarehouseWaybill.Text))
+					{
+						// 没物流信息的仓库单手动更新买手物流信息
+						JObject data = new JObject();
+						data["orderNo"] = OrderItem.order_id;
+						data["orderCode"] = TransitOrder?.order_code;
+						data["logisticsExpressCode"] = this.txtWarehouseWaybill.Text;
+						data["logisticsExpressCompany"] = this.txtExpressName.Text;
+						var updateTransitExpressUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/updateLogisticsExpressCode";
+						var updateTransitExpressStr = JsonHelper.SerializeObject(data);
+						var updateTransitExpressRst = HttpResponseWXBLL.e57PostResponse(updateTransitExpressUrl, updateTransitExpressStr, "");
+					}
+				}

 				if (OrderItem.ItemTransitOrderAfterSale != null)
 				{
@@ -73,8 +99,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 				else
 				{
 					// 需要手动申请售后的，先去申请售后再提交拦截退回总店
-					if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
-						OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
+					if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
+						(OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
 					{
 						btnAdd.IsEnabled = false;
 						imgLoading.Visibility = Visibility.Visible;
@@ -89,7 +115,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 						btnAdd.IsEnabled = true;
 					}

-					if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
+					if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
 					{
 						txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
 						btnAddressAnalysis_Click(null, null);
@@ -107,8 +133,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 				}
 			}

-			//if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
-			////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1)
+			//if (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
 			//{
 			//    btnAdd.IsEnabled = false;
 			//    //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后，请联系买家直接退回总店！");
@@ -116,7 +141,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 			//    return;
 			//}

-			if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
+			if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
            {
 				//btnAdd.IsEnabled = false;
 				//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店，建议联系买家直接退回总店！";
@@ -127,6 +152,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
        {
 			if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
 			{
+				// 创建拦截退货包裹工单
 				var workOrder = AddWorkOrder();
 				if (!workOrder.Contains("\"success\":true"))
 				{
@@ -151,7 +177,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows

 			JObject data = new JObject();
            data["orderNo"] = OrderItem.order_id;
-            data["orderCode"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
+            data["orderCode"] = TransitOrder?.order_code;
            data["refundProvince"] = txtProvince.Text.Trim();
            data["refundCity"] = txtCity.Text.Trim();
            data["refundCounty"] = txtCounty.Text.Trim();
@@ -160,6 +186,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
            data["recipientPhone"] = txtMobile.Text.Trim();
            data["account_user"] = BaseClass.UserName;
            data["accountUser"] = BaseClass.UserName;
+			//if (string.IsNullOrWhiteSpace(TransitOrder?.express_1_waybill) && string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) &&
+			//	!string.IsNullOrWhiteSpace(txtWarehouseWaybill.Text) && !string.IsNullOrWhiteSpace(txtExpressName.Text.Trim()))
+			//{
+			//	data["refundWaybill"] = txtWarehouseWaybill.Text.Trim();
+			//	data["returnExpressCompany"] = txtExpressName.Text.Trim();
+			//}
 			//data["platform"] = "WEISHOP";

 			if (GlobalConfig.BuyConfig.IsUseAppBalance)
@@ -249,9 +281,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows

 		public string AddWorkOrder()
 		{
-			if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
-				return "\"success\":true,\"message\":\"已到仓，无需拦截工单\"";
-			if (OrderItem.ItemTransitOrderWithVoid?.warehouse_status == 3)
+			if (TransitOrder?.warehouse_status == 3)
 				return "\"success\":true,\"message\":\"已到仓，无需拦截工单\"";

 			string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
@@ -259,7 +289,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 			obj["appId"] = this.OrderItem.Shop?.ShopId;
 			obj["wechatOrderNo"] = this.OrderItem.order_id;
 			//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
-			obj["purchaseOrderNo"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
+			obj["purchaseOrderNo"] = TransitOrder?.order_code;
 			obj["creator"] = BaseClass.UserName;
 			obj["remark"] = "客户要求拦截并退回云仓";

@@ -37,7 +37,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>

-        public static int VersionCount = 362;
+        public static int VersionCount = 365;

 		//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string ServerUrl
@@ -43,14 +43,38 @@ namespace AllBase.Model.DBModel

    public class TransitWarehouseData
    {
+		public static Dictionary<string, string> dicWarehouseIdName = new Dictionary<string, string>()
+		{
+			{ "XDYBJC", "北京仓" },
+			{ "XDYGZC", "广州仓" },
+			{ "XDYWHC", "武汉2仓" },
+			{ "XDYSHANDC", "山东2仓" },
+			{ "XDYSHC", "上海新仓" },
+			{ "XDYSZC", "深圳仓" },
+			{ "XDYYWC", "义乌仓" },
+			{ "XDYJJC", "晋江仓" },
+			{ "XDYCDC", "成都仓" },
+			{ "XDYCHONGQC", "重庆2仓" },
+			{ "XDYHEBC", "哈尔滨仓" },
+			{ "XDYXA", "西安仓" },
+			{ "XDYGYC", "贵阳仓" },
+			{ "XDYKMC", "昆明仓" },
+			{ "XDYSSC", "河北仓" },
+			{ "XDYZZC", "郑州仓" },
+			{ "XDYFJSSC", "福建仓" },
+		};
+
        public static string TransitWarehouseDataStr = @"
 XDYBJC     ;北京仓   ;胡萍     ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
 XDYGZC     ;广州仓   ;何外华   ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
 XDYWHC     ;武汉2仓  ;杨先生   ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
 XDYSHANDC  ;山东2仓  ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司（仓库二楼） ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司（仓库二楼）
 XDYSHC     ;上海新仓 ;纪先生   ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市 ;普陀区 ;真如镇街道 ;真北路2653弄T区
-XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼";
-		//XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
+XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
+XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
+XDYFJSSC   ;福建仓   ;小张     ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
+
+		//XDYFJSSC	石狮仓	福建省/泉州市/晋江市青阳街道中堡电商园一栋
 		//XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;北苑街道 ;西站大道妈妈商贸18号库39号楼誉达
 		//XDYJJC     ;晋江仓   ;安群     ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
 		//XDYCDC     ;成都仓   ;谢春虹   ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库（不要放驿站，送到仓库） ;26 ;340 ;2898 ;四川省 ;资阳市
@@ -97,5 +97,19 @@ namespace AllBase.Model.DBModel
        /// 下游快递公司编码
        /// </summary>
        public string downstream_express_code { get; set; }
-    }
+		/// <summary>
+		/// 订单初始费用（分）
+		/// </summary>
+		public int? postage { get; set; }
+		public DateTime? pickup_time { get; set; }
+		/// <summary>
+		/// 货架号
+		/// </summary>
+		public string location_code { get; set; }
+		/// <summary>
+		/// 货架写入时间
+		/// </summary>
+		public DateTime? location_write_time { get; set; }
+
+	}
 }
@@ -145,5 +145,29 @@ namespace AllBase.Model.DBModel
 		/// 拦截退回操作信息/回调信息
 		/// </summary>
 		public string intercept_return_info { get; set; }
+		/// <summary>
+		/// 是否手动发货：0自动发货，1手动发货
+		/// </summary>
+		public int is_manual_shipment { get; set; }
+		/// <summary>
+		/// 手动发货处理状态：0未处理，1成功，2失败
+		/// </summary>
+		public int? manual_shipment_status { get; set; }
+		/// <summary>
+		/// 货架号
+		/// </summary>
+		public string location_code { get; set; }
+		/// <summary>
+		/// 货架写入时间
+		/// </summary>
+		public DateTime? location_write_time { get; set; }
+		/// <summary>
+		/// 虚拟快递单号
+		/// </summary>
+		public string virtual_waybill_no { get; set; }
+		/// <summary>
+		/// 虚拟快递公司
+		/// </summary>
+		public string virtual_express_company { get; set; }
 	}
 }
@@ -1,5 +1,6 @@
 using AllBase.Helper;
 using AllBase.Model.MvvmBaseClasses;
+using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -18,7 +19,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 		set 
 		{ 
 			this.SetValue(x => x.OrderItem, value);
-			GetOrderItemTransitDetail();
+			GetOrderItemTransitList();
 		}
 	}

@@ -28,74 +29,369 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
 		private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
 	}

-	void GetOrderItemTransitDetail()
+	void GetOrderItemTransitList()
+	{
+		List<oms_wei_order_item_transit_detail_info> transitDetailList =
+		[
+			.. GetOrderItemTransitDetailList(),
+			.. GetOrderItemTransitAftersaleList(),
+			.. GetOrderItemTransitExtraList(),
+		];
+
+		this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
+	}
+
+	/// <summary>
+	/// 获取发货包裹对应信息列表
+	/// </summary>
+	/// <returns></returns>
+	List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitDetailList()
 	{
 		if (OrderItem == null || OrderItem.ItemOrder == null)
 		{
-			this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>();
-			return;
+			return new List<oms_wei_order_item_transit_detail_info>();
 		}

-		List<oms_wei_order_item_transit_detail_info> transitDetailList = new List<oms_wei_order_item_transit_detail_info>();
+		List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
+
 		foreach (var transitOrder in OrderItem.ItemTransitOrders ?? new List<oms_wei_external_procurement_log_info>())
 		{
-
-			var transitDetail = new oms_wei_order_item_transit_detail_info()
+			try
 			{
-				TransitTypeStr = "发货包裹",
+				var transitDetail = new oms_wei_order_item_transit_detail_info()
+				{
+					oms_wei_order_item_info = OrderItem,
+					oms_wei_external_procurement_log_info = transitOrder,

-				OrderCode = transitOrder.order_code,
-				SourceCode = transitOrder.random_code,
+					ShopName = OrderItem.ItemOrder.shop_name,

-				WxOrderId = transitOrder.order_no,
-				WxOrderSkuId = transitOrder.order_sku_id,
-				WxOrderThumbImg = OrderItem.thumb_img,
-				WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
+					TransitTypeStr = "发货包裹",

-				OutOrderId = transitOrder.out_order_no,
-				OutBuyerName = transitOrder.OutOrderBuyerStr,
+					OrderCode = transitOrder.order_code,
+					SourceCode = transitOrder.random_code,

-				UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
-				DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
-				BuyReundStatus = transitOrder.refund_status,
+					WxOrderId = transitOrder.order_no,
+					WxOrderSkuId = transitOrder.order_sku_id,
+					WxOrderThumbImg = OrderItem.thumb_img,
+					WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,

-				PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
-				InboundTime = transitOrder.inbound_time,
-				OutboundTime = transitOrder.outbound_time,
-			};
+					TransitAddTimeStr = transitOrder.created_time.ToString("yyyy-MM-dd HH:mm:ss"),

-			if (!transitDetail.OutOrderId.StartsWith("tb_"))
-				transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
-			else
-				transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
+					OutOrderId = transitOrder.out_order_no,
+					OutBuyerName = transitOrder.OutOrderBuyerStr,

-			// 中转仓订单创建状态 0 未使用，1 已创建，2 创建失败，3 处理中（业务方根据此字段处理中转流程）
-			if (transitOrder.transfer_warehouse_status == 1)
-				transitDetail.TransitStatus = "已创建";
-			else if (transitOrder.transfer_warehouse_status == 2)
-				transitDetail.TransitStatus = "创建失败";
-			else if (transitOrder.transfer_warehouse_status == 3)
-				transitDetail.TransitStatus = "创建中";
+					//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
+					UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
+					DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
+					BuyRefundStatus = transitOrder.refund_status,

-			// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
-			if (transitOrder.warehouse_status == 0)
-				transitDetail.WarehouseStatus = "已创建";
-			else if (transitOrder.warehouse_status == 1)
-				transitDetail.WarehouseStatus = "已入库";
-			else if (transitOrder.warehouse_status == 2)
-				transitDetail.WarehouseStatus = "已出库";
-			else if (transitOrder.warehouse_status == 3)
-				transitDetail.WarehouseStatus = "已拦截到仓";
+					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,

-			transitDetailList.Add(transitDetail);
+					WarehouseId = transitOrder.platform,
+					WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
+
+					ShelfCodeStr = transitOrder.location_code,
+					ShelfTimeStr = transitOrder.location_write_time == null ? "" : transitOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+				};
+
+				if (!transitDetail.OutOrderId.StartsWith("tb_"))
+					transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
+				else
+					transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
+
+				// 中转仓订单创建状态 0 未使用，1 已创建，2 创建失败，3 处理中（业务方根据此字段处理中转流程）
+				if (transitOrder.transfer_warehouse_status == 0)
+					transitDetail.TransitStatus = "未使用";
+				if (transitOrder.transfer_warehouse_status == 1)
+					transitDetail.TransitStatus = "已创建";
+				else if (transitOrder.transfer_warehouse_status == 2)
+					transitDetail.TransitStatus = "创建失败";
+				else if (transitOrder.transfer_warehouse_status == 3)
+					transitDetail.TransitStatus = "创建中";
+
+				// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
+				if (transitOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "已创建";
+				else if (transitOrder.warehouse_status == 1)
+					transitDetail.WarehouseStatus = "已入库";
+				else if (transitOrder.warehouse_status == 2)
+					transitDetail.WarehouseStatus = "已出库";
+				else if (transitOrder.warehouse_status == 3)
+					transitDetail.WarehouseStatus = "已拦截到仓";
+
+				if (transitOrder.order_void_status == 1)
+					transitDetail.TransitVoidStatus = "已作废";
+				//else if (transitOrder.order_void_status == 2)
+				//	transitDetail.TransitVoidStatus = "作废失败";
+
+				if (transitOrder?.has_reject == 1)
+					transitDetail.TransitRejectStatus = "已申请拒收";
+				if (transitOrder?.has_reject == 2)
+					transitDetail.TransitRejectStatus = "申请失败";
+				if (transitOrder?.has_reject == 3)
+					transitDetail.TransitRejectStatus = "申请成功";
+				if (transitOrder?.has_reject == 5)
+					transitDetail.TransitRejectStatus = "已取消拒收";
+				if (transitOrder?.has_reject == 99)
+					transitDetail.TransitRejectStatus = "拒收成功";
+
+				var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
+				var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
+				if (transitAfterSaleOrder != null)
+					transitDetail.TransitReturnStatus = "已申请拦截";
+				if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
+					transitDetail.TransitReturnStatus = "拦截成功";
+				else if (transitOrder.intercept_return_status == 2)
+					transitDetail.TransitReturnStatus = "拦截失败";
+
+				detailList.Add(transitDetail);
+			}
+			catch (Exception ex)
+			{
+				
+			}
+		}
+		return detailList;
+	}
+
+	/// <summary>
+	/// 获取退货包裹对应信息列表
+	/// </summary>
+	/// <returns></returns>
+	List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitAftersaleList()
+	{
+		if (OrderItem == null || OrderItem.ItemOrder == null)
+		{
+			return new List<oms_wei_order_item_transit_detail_info>();
 		}

-		this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
+		List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
+
+		foreach (var transitAftersaleOrder in OrderItem.ItemTransitOrderAfterSales ?? new List<oms_wei_external_procurement_after_sale_info>())
+		{
+			try
+			{
+				var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
+				var transitDetail = new oms_wei_order_item_transit_detail_info()
+				{
+					oms_wei_order_item_info = OrderItem,
+					oms_wei_external_procurement_after_sale_info = transitAftersaleOrder,
+
+					ShopName = OrderItem.ItemOrder.shop_name,
+
+					//TransitTypeStr = "拦截退回",
+					TransitTypeStr = "退货包裹",
+
+					OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
+					SourceCode = transitOrder?.random_code,
+
+					WxOrderId = transitAftersaleOrder.order_no,
+					WxOrderSkuId = transitOrder?.order_sku_id,
+					WxOrderThumbImg = OrderItem.thumb_img,
+					WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
+
+					TransitAddTimeStr = transitAftersaleOrder.created_time == null ? "" : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+
+					OutOrderId = transitOrder?.out_order_no,
+					OutBuyerName = transitOrder?.OutOrderBuyerStr,
+
+					UpperWaybill = (transitAftersaleOrder.return_express_company + "-" + transitAftersaleOrder.refund_waybill).Trim('-'),
+					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"),
+					InboundTime = transitAftersaleOrder.inbound_time,
+					OutboundTime = transitAftersaleOrder.outbound_time,
+
+					WarehouseId = transitOrder?.platform,
+					WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
+
+					ShelfCodeStr = transitAftersaleOrder.location_code,
+					ShelfTimeStr = transitAftersaleOrder.location_write_time == null ? "" : transitAftersaleOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+				};
+
+				if (!transitDetail.OutOrderId.StartsWith("tb_"))
+					transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
+				else
+					transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
+
+				// 退货包裹处理状态，0未处理，1处理中，2已完成，9异常
+				if (transitAftersaleOrder.status == 0)
+					transitDetail.TransitStatus = "未处理";
+				if (transitAftersaleOrder.status == 1)
+					transitDetail.TransitStatus = "处理中";
+				else if (transitAftersaleOrder.status == 2)
+					transitDetail.TransitStatus = "已完成";
+				else if (transitAftersaleOrder.status == 9)
+					transitDetail.TransitStatus = "异常";
+
+				// 退货包裹入库状态 1=入库 2=出库
+				if (transitAftersaleOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "已创建";
+				else if (transitAftersaleOrder.warehouse_status == 1)
+					transitDetail.WarehouseStatus = "已入库";
+				else if (transitAftersaleOrder.warehouse_status == 2)
+					transitDetail.WarehouseStatus = "已出库";
+				else if (transitAftersaleOrder.warehouse_status == 3)
+					transitDetail.WarehouseStatus = "已拦截到仓";
+
+				// 售后暂时没有作废状态
+				//if (transitAftersaleOrder.order_void_status == 1)
+				//	transitDetail.TransitVoidStatus = "已作废";
+				//else if (transitOrder.order_void_status == 2)
+				//	transitDetail.TransitVoidStatus = "作废失败";
+
+				// 售后表没有拒收和拒收状态功能
+
+				// 售后表拦截成功状态在主表或者额外包裹表显示
+
+				detailList.Add(transitDetail);
+			}
+			catch (Exception ex)
+			{
+				
+			}
+		}
+		return detailList;
+	}
+
+	/// <summary>
+	/// 获取额外包裹对应信息列表
+	/// </summary>
+	/// <returns></returns>
+	List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitExtraList()
+	{
+		if (OrderItem == null || OrderItem.ItemOrder == null)
+		{
+			return new List<oms_wei_order_item_transit_detail_info>();
+		}
+
+		List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
+
+		foreach (var transitExtraOrder in OrderItem.ItemTransitExtraOrders ?? new List<oms_wei_transfer_extra_package>())
+		{
+			try
+			{
+				var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitExtraOrder.order_code);
+				var transitDetail = new oms_wei_order_item_transit_detail_info()
+				{
+					oms_wei_order_item_info = OrderItem,
+					oms_wei_transfer_extra_package = transitExtraOrder,
+
+					ShopName = OrderItem.ItemOrder.shop_name,
+
+					TransitTypeStr = "额外包裹",
+
+					OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
+					SourceCode = transitOrder?.random_code,
+
+					WxOrderId = transitExtraOrder.order_no,
+					WxOrderSkuId = transitOrder?.order_sku_id,
+					WxOrderThumbImg = OrderItem.thumb_img,
+					WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
+
+					TransitAddTimeStr = transitExtraOrder.created_time == null ? "" : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+
+					OutOrderId = transitOrder?.out_order_no,
+					OutBuyerName = transitOrder?.OutOrderBuyerStr,
+
+					UpperWaybill = (transitExtraOrder.logistics_code + "-" + transitExtraOrder.logistics_express_code).Trim('-'),
+					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"),
+					InboundTime = transitExtraOrder.inbound_time,
+					OutboundTime = transitExtraOrder.outbound_time,
+
+					WarehouseId = transitOrder?.platform,
+					WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
+
+					ShelfCodeStr = transitExtraOrder.location_code,
+					ShelfTimeStr = transitExtraOrder.location_write_time == null ? "" : transitExtraOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+				};
+
+				if (!transitDetail.OutOrderId.StartsWith("tb_"))
+					transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
+				else
+					transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
+
+				// 额外包裹处理状态，0 未使用，1 已创建，2 创建失败
+				if (transitExtraOrder.transfer_warehouse_status == 0)
+					transitDetail.TransitStatus = "未使用";
+				if (transitExtraOrder.transfer_warehouse_status == 1)
+					transitDetail.TransitStatus = "已创建";
+				else if (transitExtraOrder.transfer_warehouse_status == 2)
+					transitDetail.TransitStatus = "创建失败";
+				else if (transitExtraOrder.transfer_warehouse_status == 3)
+					transitDetail.TransitStatus = "处理中";
+
+				// 额外包裹入库状态 1=入库 2=出库
+				if (transitExtraOrder.warehouse_status == 0)
+					transitDetail.WarehouseStatus = "已创建";
+				else if (transitExtraOrder.warehouse_status == 1)
+					transitDetail.WarehouseStatus = "已入库";
+				else if (transitExtraOrder.warehouse_status == 2)
+					transitDetail.WarehouseStatus = "已出库";
+				else if (transitExtraOrder.warehouse_status == 3)
+					transitDetail.WarehouseStatus = "已拦截到仓";
+
+				// 额外包裹作废状态
+				if (transitExtraOrder.order_void_status == 1)
+					transitDetail.TransitVoidStatus = "已作废";
+				//else if (transitExtraOrder.order_void_status == 2)
+				//	transitDetail.TransitVoidStatus = "作废失败";
+
+				if (transitExtraOrder?.has_reject == 1)
+					transitDetail.TransitRejectStatus = "已申请拒收";
+				if (transitExtraOrder?.has_reject == 2)
+					transitDetail.TransitRejectStatus = "申请失败";
+				if (transitExtraOrder?.has_reject == 3)
+					transitDetail.TransitRejectStatus = "申请成功";
+				if (transitExtraOrder?.has_reject == 5)
+					transitDetail.TransitRejectStatus = "已取消拒收";
+				if (transitExtraOrder?.has_reject == 99)
+					transitDetail.TransitRejectStatus = "拒收成功";
+
+				// 额外包裹拦截状态暂时没有，待补充
+				//var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
+				//var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
+				//if (transitAfterSaleOrder != null)
+				//	transitDetail.TransitReturnStatus = "已申请拦截";
+				//if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
+				//	transitDetail.TransitReturnStatus = "拦截成功";
+				//else if (transitOrder.intercept_return_status == 2)
+				//	transitDetail.TransitReturnStatus = "拦截失败";
+
+				detailList.Add(transitDetail);
+			}
+			catch (Exception ex)
+			{
+
+			}
+		}
+		return detailList;
 	}
 }

 public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 {
+	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 string ShopName
+	{
+		get { return this.GetValue(x => x.ShopName); }
+		set { this.SetValue(x => x.ShopName, value); }
+	}
+
 	/// <summary>
 	/// 仓库类型 发货包裹 退货包裹
 	/// </summary>
@@ -116,6 +412,21 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.SourceCode); }
 		set { this.SetValue(x => x.SourceCode, value); }
 	}
+	public string WarehouseId
+	{
+		get { return this.GetValue(x => x.WarehouseId); }
+		set { this.SetValue(x => x.WarehouseId, value); }
+	}
+	public string WarehouseName
+	{
+		get { return this.GetValue(x => x.WarehouseName); }
+		set { this.SetValue(x => x.WarehouseName, value); }
+	}
+	public string CreateTimeStr
+	{
+		get { return this.GetValue(x => x.CreateTimeStr); }
+		set { this.SetValue(x => x.CreateTimeStr, value); }
+	}
 	/// <summary> 取号时间((中转单)创建时间) </summary>
 	public DateTime? PickUpTime
 	{
@@ -150,6 +461,14 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.WxOrderCreateTimeStr); }
 		set { this.SetValue(x => x.WxOrderCreateTimeStr, value); }
 	}
+	/// <summary>
+	/// 添加记录时间
+	/// </summary>
+	public string TransitAddTimeStr
+	{
+		get { return this.GetValue(x => x.TransitAddTimeStr); }
+		set { this.SetValue(x => x.TransitAddTimeStr, value); }
+	}
 	public string WxOrderThumbImg
 	{
 		get { return this.GetValue(x => x.WxOrderThumbImg); }
@@ -184,11 +503,29 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 		get { return this.GetValue(x => x.WarehouseStatus); }
 		set { this.SetValue(x => x.WarehouseStatus, value); }
 	}
-	/// <summary> 买手退货状态 </summary>
-	public string BuyReundStatus
+	/// <summary> 作废状态 </summary>
+	public string TransitVoidStatus
 	{
-		get { return this.GetValue(x => x.BuyReundStatus); }
-		set { this.SetValue(x => x.BuyReundStatus, value); }
+		get { return this.GetValue(x => x.TransitVoidStatus); }
+		set { this.SetValue(x => x.TransitVoidStatus, value); }
+	}
+	/// <summary> 拒收状态 </summary>
+	public string TransitRejectStatus
+	{
+		get { return this.GetValue(x => x.TransitRejectStatus); }
+		set { this.SetValue(x => x.TransitRejectStatus, value); }
+	}
+	/// <summary> 拦截退回状态 </summary>
+	public string TransitReturnStatus
+	{
+		get { return this.GetValue(x => x.TransitReturnStatus); }
+		set { this.SetValue(x => x.TransitReturnStatus, value); }
+	}
+	/// <summary> 买手退货状态 </summary>
+	public string BuyRefundStatus
+	{
+		get { return this.GetValue(x => x.BuyRefundStatus); }
+		set { this.SetValue(x => x.BuyRefundStatus, value); }
 	}

 	public string UpperWaybill
@@ -209,7 +546,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 	public Visibility DownWaybillVisibility
 	{
 		get { return this.GetValue(x => x.DownWaybillVisibility); }
-		private set { this.SetValue(x => x.DownWaybillVisibility, value); }
+		set { this.SetValue(x => x.DownWaybillVisibility, value); }
 	}

 	public DateTime? InboundTime
@@ -220,7 +557,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 	public string InboundTimeStr
 	{
 		get { return this.GetValue(x => x.InboundTimeStr); }
-		private set { this.SetValue(x => x.InboundTimeStr, value); }
+	    set { this.SetValue(x => x.InboundTimeStr, value); }
 	}
 	public DateTime? OutboundTime
 	{
@@ -230,6 +567,18 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
 	public string OutboundTimeStr
 	{
 		get { return this.GetValue(x => x.OutboundTimeStr); }
-		private set { this.SetValue(x => x.OutboundTimeStr, value); }
+		set { this.SetValue(x => x.OutboundTimeStr, value); }
+	}
+
+	public string ShelfCodeStr
+	{
+		get { return this.GetValue(x => x.ShelfCodeStr); }
+		set { this.SetValue(x => x.ShelfCodeStr, value); }
+	}
+
+	public string ShelfTimeStr
+	{
+		get { return this.GetValue(x => x.ShelfTimeStr); }
+		set { this.SetValue(x => x.ShelfTimeStr, value); }
 	}
 }
@@ -48,4 +48,12 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
 	public DateTime? rejected_time { get; set; } // '拒收时间',
 	public int? has_reject { get; set; } // DEFAULT NULL,
 	public DateTime? blocked_arrival_time { get; set; }
+	/// <summary>
+	/// 货架号
+	/// </summary>
+	public string location_code { get; set; }
+	/// <summary>
+	/// 货架写入时间
+	/// </summary>
+	public DateTime? location_write_time { get; set; }
 }
@@ -376,29 +376,29 @@ namespace Work._29Tools.Forms.ShopForms
 				return;
 			}

-			{
-				JObject endActivityObj = new JObject();
-				endActivityObj["platformActivityId"] = "1269";
-				JArray arr = new JArray();
-				foreach (var sku in prodObjs["skuList"])
-				{
-					JObject obj = new JObject();
-					obj["productId"] = spuId;
-					obj["skuId"] = sku["skuId"];
-					arr.Add(obj);
-				}
-				endActivityObj["productList"] = arr;
-				endActivityObj["actionType"] = 1;
-				//{ "platformActivityId":"1016","productList":[{ "productId":"10000879673464","skuId":"15601266074"},{ "productId":"10000879673464","skuId":"15601240593"}],"actionType":1}
+			//{
+			//	JObject endActivityObj = new JObject();
+			//	endActivityObj["platformActivityId"] = "1269";
+			//	JArray arr = new JArray();
+			//	foreach (var sku in prodObjs["skuList"])
+			//	{
+			//		JObject obj = new JObject();
+			//		obj["productId"] = spuId;
+			//		obj["skuId"] = sku["skuId"];
+			//		arr.Add(obj);
+			//	}
+			//	endActivityObj["productList"] = arr;
+			//	endActivityObj["actionType"] = 1;
+			//	//{ "platformActivityId":"1016","productList":[{ "productId":"10000879673464","skuId":"15601266074"},{ "productId":"10000879673464","skuId":"15601240593"}],"actionType":1}

-				rst = WxSimProductBLL.cancelActivity(shop, endActivityObj);
-				if (!rst.Contains("\"code\":0"))
-				{
-					var error = BaseRegex.GetStringJsonByRegs(ref rst, rst, "err_msg", "error_msg", "errMsg", "errorMsg");
-					BaseMsgForm.ShowError("取消优惠失败 " + error);
-					return;
-				}
-			}
+			//	rst = WxSimProductBLL.cancelActivity(shop, endActivityObj);
+			//	if (!rst.Contains("\"code\":0"))
+			//	{
+			//		var error = BaseRegex.GetStringJsonByRegs(ref rst, rst, "err_msg", "error_msg", "errMsg", "errorMsg");
+			//		BaseMsgForm.ShowError("取消优惠失败 " + error);
+			//		return;
+			//	}
+			//}

 			{
 				JObject endActivityObj = new JObject();