优化售后仓退货相关逻辑

2026-08-17 01:32:29 +08:00
1 parent d06ec9badc
commit 05a48bf605
@@ -240,34 +240,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				// 读取中转仓拍单订单售后状态
 				var transitAfterSaleList = GetTransitWarehouseAfterSaleList(order_ids);

+				// 读取分销退货（中转仓退货）订单
+				var transitReturnOrderList = GetTransitReturnOrderList(order_ids);
+
 				// 读取暂时记录的买手订单，后面想办法放到中转订单库里去
 				var pddBuyerOrders = GetPddBuyerOrders(order_ids);

-
 				// 读取暂时记录的买手售后单，后面想办法放到中转订单库里去
-				var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
-				var data6 = UserLogin.GetSignaturex();
-				data6 += "&wx_order_id_in=" + order_ids;
-				List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
-				if (!string.IsNullOrEmpty(order_ids))
-				{
-					var html6 = GetHtml.PostUtf8(url6, data6);
-					if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
-						html6 = GetHtml.PostUtf8(url6, data6);
-					if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
-					{
-						BaseMsgWindow.ShowError("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"));
-						break;
-					}
-					try
-					{
-						pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString())
-							.OrderByDescending(p => p.TransitCreateTime).ToList();
-					}
-					catch
-					{
-					}
-				}
+				var pddBuyerAfterSales = GetPddBuyerAfterSales(order_ids);

 				// 读取关联拍单商品
 				var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
@@ -331,6 +311,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 								item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
 							// 中转仓退货包裹订单
 							item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code)).ToList();
+							item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();

 							// 中转仓买手订单(wx_send_type等于0)
 							item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
@@ -567,6 +548,36 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			return new List<oms_wei_external_procurement_after_sale_info>();
 		}

+		public static List<distrib_return_order_info> GetTransitReturnOrderList(string order_ids)
+		{
+			if (string.IsNullOrEmpty(order_ids))
+				return new List<distrib_return_order_info>();
+
+			// 读取中转仓处理售后单
+			var url5 = BaseClass.Build29WxObjString("order/wx_get_erp_return_order_list");
+			var data5 = UserLogin.GetSignaturex();
+			data5 += "&erp_order_id_in=" + order_ids;
+			var html5 = GetHtml.PostUtf8(url5, data5);
+			if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
+				html5 = GetHtml.PostUtf8(url5, data5);
+			if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
+			{
+				BaseMsgWindow.ShowAnimateMessage("云仓分销退货订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
+			}
+			List<distrib_return_order_info> transitAfterSaleList = new List<distrib_return_order_info>();
+			try
+			{
+				transitAfterSaleList = JsonHelper.DeserializeJsonToList<distrib_return_order_info>(JObject.Parse(html5)["data"].ParseToString())
+					.OrderByDescending(p => p.created_at).ToList();
+				if (transitAfterSaleList != null)
+					return transitAfterSaleList;
+			}
+			catch
+			{
+			}
+			return new List<distrib_return_order_info>();
+		}
+
 		public static List<order_pdd_buyer_order> GetPddBuyerOrders(string order_ids)
 		{
 			if (string.IsNullOrEmpty(order_ids))
@@ -595,6 +606,34 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			return new List<order_pdd_buyer_order>();
 		}

+		public static List<order_pdd_buyer_after_sale> GetPddBuyerAfterSales(string order_ids)
+		{
+			var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
+			var data6 = UserLogin.GetSignaturex();
+			data6 += "&wx_order_id_in=" + order_ids;
+			List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
+			if (!string.IsNullOrEmpty(order_ids))
+			{
+				var html6 = GetHtml.PostUtf8(url6, data6);
+				if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
+					html6 = GetHtml.PostUtf8(url6, data6);
+				if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
+				{
+					BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
+					return new List<order_pdd_buyer_after_sale>();
+				}
+				try
+				{
+					pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
+					return pddBuyerAfterSales;
+				}
+				catch
+				{
+				}
+			}
+			return new List<order_pdd_buyer_after_sale>();
+		}
+
 		public void GetShopWaybillExceptionOrder()
 		{
 			foreach (var shop in GlobalConfig.ShopLoginList)
@@ -754,8 +793,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 						//}
 						// 260801-439070256640980260801-439070256640980
 						// string url = "https://mobile.yangkeduo.com/complaint.html?mode=128&after_sales_id=22059412840967&order_sn=260801-439070256640980"
-						if (orderItem.TransitRefundStatusStr.Contains("待用户发货") && orderItem.ItemTransitOrderAfterSale?.downstream_waybill != null)
+						if (orderItem.TransitRefundStatusStr.Contains("待用户发货") && !(orderItem.ItemTransitOrderAfterSale?.downstream_waybill).IsNullOrEmpty())
 						{
+							if (orderItem.order_id == "3738382691615546112")
+							{
+
+							}
 							string orderSn = orderItem.ItemTransitOrderWithVoid.out_order_no;
 							if (orderSn.IsNullOrEmpty())
 								continue;
@@ -1513,6 +1513,7 @@
                        Grid.Column="1"
                        Margin="2,0,0,0"
                        HorizontalAlignment="Center"
+                        d:Content="申请"
                        Background="Transparent"
                        BorderBrush="Transparent"
                        Click="btnAddEditTransitWarehouseReject_Click"
@@ -1546,7 +1547,7 @@
                        IsReadOnly="True"
                        Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
                        TextWrapping="Wrap"
-                        WaterMark="退回中转仓" />
+                        WaterMark="中转仓退回" />
                    <!--  Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"  -->
                    <Button
                        x:Name="btnAddEditTransitWarehouseAfterSale"
@@ -1554,6 +1555,7 @@
                        Grid.Column="1"
                        Margin="2,0,0,0"
                        HorizontalAlignment="Center"
+                        d:Content="添加"
                        Background="Transparent"
                        BorderBrush="Transparent"
                        Click="btnAddEditTransitWarehouseAfterSale_Click"
@@ -1566,7 +1568,7 @@
                    Grid.Column="1"
                    Width="auto"
                    Orientation="Horizontal"
-                    Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
+                    Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
                    <TextBox
                        Grid.Row="2"
                        Grid.Column="1"
@@ -1608,11 +1610,48 @@
                    </Border>
                </WrapPanel>

-                <!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Width="auto" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
-                    <TextBox Text="云仓退货：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
-                    <Button Grid.Column="1" Grid.Row="2" x:Name="btnRetrunOrder" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                        Margin="2,0,0,0" Content="退货" Click="btnReturnOrder_Click" Cursor="Hand"></Button>
-                </WrapPanel>-->
+                <WrapPanel
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Width="auto"
+                    Orientation="Horizontal"
+                    Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="云仓退货：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtTransitReturnOrderWaybill"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="{Binding DistribReturnOrderInfo.real_logistics_express_code}"
+                        TextWrapping="Wrap"
+                        WaterMark="云仓退货" />
+                    <Button
+                        x:Name="btnRetrunOrder"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="2,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Content="添加"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnReturnOrder_Click"
+                        Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}" />
+                </WrapPanel>

            </Grid>
            <!--  操作  -->
@@ -269,8 +269,9 @@ namespace _29WxOrderWpf
                        shop.Is29Supplier = shopExist.Is29Supplier;
                        shop.IsSelect = shopExist.IsSelect;
                        shop.IsFilter = shopExist.IsFilter;
-                        list.Remove(shopExist);
-                    }
+                        list.Remove(shopExist); 
+						shopExist = list.LastOrDefault(l => l.ShopId == shop.ShopId);
+					}
                    // 更新店铺 // 代发管理中更新
                    //foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
                    //{
@@ -288,7 +289,11 @@ namespace _29WxOrderWpf
                       
                        var t = Task.Run(() =>
                        {
-                            while (cList.Count > 20) { Thread.Sleep(100); }
+                            while (cList.Count > 20)
+							{
+								tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled);
+								Thread.Sleep(100);
+							}
                            cList.Add(1);
                            try
                            {
@@ -325,8 +330,8 @@ namespace _29WxOrderWpf
                            catch
                            {
                            }
-                            if (cList.Count > 0)
-                                cList.RemoveAt(0);
+                            //if (cList.Count > 0)
+                            //    cList.RemoveAt(0);
                        });
                        tList.Add(t);
                    }
@@ -346,7 +351,10 @@ namespace _29WxOrderWpf
            isReadShop = false;
            hasReadShop = true;

-            while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100); }
+			while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1)
+			{
+				tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100);
+			}
        }
        #endregion

@@ -1,101 +1,278 @@
-<basewindows:BaseWindow x:Class="_29WxOrderWpf.Windows.OrderWindows.TransitReturnOrderWindow" xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
-        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
-        xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls" xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
-        mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
-        Title="创建退货单" Height="650" Width="900" ResizeMode="NoResize" Loaded="TransitAfterSaleWindow_Loaded">
-    <Grid Background="Transparent" x:Name="mainGrid" Margin="2">
+<basewindows:BaseWindow
+    x:Class="_29WxOrderWpf.Windows.OrderWindows.TransitReturnOrderWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
+    xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
+    Title="创建退货单"
+    Width="900"
+    Height="650"
+    Loaded="TransitAfterSaleWindow_Loaded"
+    ResizeMode="NoResize"
+    Style="{StaticResource BaseNoneBorderWindowStyle}"
+    mc:Ignorable="d">
+    <Grid
+        x:Name="mainGrid"
+        Margin="2"
+        Background="Transparent">
        <Grid.RowDefinitions>
-            <RowDefinition Height="50"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
        <Grid x:Name="gridTitle">
            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto"></ColumnDefinition>
-                <ColumnDefinition Width="auto"></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition Width="auto" />
+                <ColumnDefinition Width="auto" />
+                <ColumnDefinition />
+                <ColumnDefinition />
            </Grid.ColumnDefinitions>
-            <Image Source="{StaticResource main29WeixinIcon}" Height="50" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="4"></Image>
-            <Label x:Name="lblAppName" FontSize="20" Margin="0,0,0,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Center"
-                   VerticalAlignment="Center" VerticalContentAlignment="Center" Content="创建退货订单" Grid.Column="1"></Label>
+            <Image
+                Width="50"
+                Height="50"
+                Margin="4"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Source="{StaticResource main29WeixinIcon}" />
+            <Label
+                x:Name="lblAppName"
+                Grid.Column="1"
+                Margin="0,0,0,0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="创建退货订单"
+                FontSize="20"
+                Foreground="{StaticResource mainColorLightBrush}" />
        </Grid>
-        <Border Background="White" Grid.Row="1" Padding="40, 20">
+        <Border
+            Grid.Row="1"
+            Padding="40,20"
+            Background="White">
            <Grid>
                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
                </Grid.ColumnDefinitions>
                <Grid>
                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="*" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
-                        <ColumnDefinition Width="20"></ColumnDefinition>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition />
                    </Grid.ColumnDefinitions>

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="1">店铺订单号：</Label>
-                    <TextBox x:Name="txtShopOrderId" Grid.Row="1" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="1"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        店铺订单号：
+                    </Label>
+                    <TextBox
+                        x:Name="txtShopOrderId"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />


-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="2">商品名称：</Label>
-                    <TextBox x:Name="txtGoodsName" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="4" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="2"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        商品名称：
+                    </Label>
+                    <TextBox
+                        x:Name="txtGoodsName"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="3">商品规格：</Label>
-                    <TextBox x:Name="txtSpecName" Grid.Row="3" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}"  BorderThickness="1" IsReadOnly="True"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        商品规格：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSpecName"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="5">收件地址解析：</Label>
-                    <TextBox x:Name="txtAddressAnalysis" Grid.Row="5" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" Height="80" BorderThickness="1" Padding="0,4"
-                         VerticalContentAlignment="Top" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" TextWrapping="Wrap" Margin="0,0,0,15"/>
-                    <Button Grid.Row="5" Grid.Column="1" x:Name="btnAddressAnalysis" Style="{StaticResource BasePageButtonStyle}" Click="btnAddressAnalysis_Click"
-                        Content="解 析" MinWidth="48" Height="28" HorizontalAlignment="Right" VerticalAlignment="Bottom" Padding="4" Margin="0,0,0,15"/>
+                    <Label
+                        Grid.Row="5"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        收件地址解析：
+                    </Label>
+                    <TextBox
+                        x:Name="txtAddressAnalysis"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Height="80"
+                        Margin="0,0,0,15"
+                        Padding="0,4"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Top"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}"
+                        TextWrapping="Wrap" />
+                    <Button
+                        x:Name="btnAddressAnalysis"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Height="28"
+                        MinWidth="48"
+                        Margin="0,0,0,15"
+                        Padding="4"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Bottom"
+                        Click="btnAddressAnalysis_Click"
+                        Content="解 析"
+                        Style="{StaticResource BasePageButtonStyle}" />

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="6">收件人：</Label>
-                    <TextBox x:Name="txtUser" Grid.Row="6" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}"  BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="6"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        收件人：
+                    </Label>
+                    <TextBox
+                        x:Name="txtUser"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="7">收件人电话：</Label>
-                    <TextBox x:Name="txtMobile" Grid.Row="7" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="7"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        收件人电话：
+                    </Label>
+                    <TextBox
+                        x:Name="txtMobile"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label HorizontalAlignment="Right" FontSize="14" Grid.Row="8" Margin="0,0,0,15">收件省/市/区：</Label>
+                    <Label
+                        Grid.Row="8"
+                        Margin="0,0,0,15"
+                        HorizontalAlignment="Right"
+                        FontSize="14">
+                        收件省/市/区：
+                    </Label>
                    <Grid Grid.Row="8" Grid.Column="1">
                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition></ColumnDefinition>
-                            <ColumnDefinition></ColumnDefinition>
-                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
                        </Grid.ColumnDefinitions>
-                        <TextBox x:Name="txtProvince" Grid.Row="0" Grid.Column="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,15"/>
-                        <TextBox x:Name="txtCity" Grid.Row="0" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="2,0,2,15"/>
-                        <TextBox x:Name="txtCounty" Grid.Row="0" Grid.Column="2" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,15"/>
+                        <TextBox
+                            x:Name="txtProvince"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Height="28"
+                            Margin="0,0,0,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+                        <TextBox
+                            x:Name="txtCity"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Height="28"
+                            Margin="2,0,2,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+                        <TextBox
+                            x:Name="txtCounty"
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            Height="28"
+                            Margin="0,0,0,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
                    </Grid>

-                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14" Grid.Row="9">收件详细地址：</Label>
-                    <TextBox x:Name="txtDetailAddress" Grid.Row="9" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                         Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="9"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        收件详细地址：
+                    </Label>
+                    <TextBox
+                        x:Name="txtDetailAddress"
+                        Grid.Row="9"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />



@@ -104,92 +281,275 @@



-                    <Label Grid.Row="1" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">店铺名称：</Label>
-                    <TextBox x:Name="txtShopName" Grid.Row="1" Grid.Column="4" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
-                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="1"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        店铺名称：
+                    </Label>
+                    <TextBox
+                        x:Name="txtShopName"
+                        Grid.Row="1"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    

-                    <Label Grid.Row="3" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">商品编号：</Label>
-                    <TextBox x:Name="txtSpuId" Grid.Row="3" Grid.Column="4" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" IsReadOnly="True"
-                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
- 
-                    
-                    <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">物流单号：</Label>
-                    <TextBox Grid.Row="4" Grid.Column="1" x:Name="txtWaybillId" BorderBrush="{StaticResource pageColorBrush}"  BorderThickness="1"
-                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>

-                    <Label Grid.Row="4" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">物流公司：</Label>
+                    <Label
+                        Grid.Row="3"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        商品编号：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSpuId"
+                        Grid.Row="3"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+
+
+                    <Label
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        物流单号：
+                    </Label>
+                    <TextBox
+                        x:Name="txtWaybillId"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+
+                    <Label
+                        Grid.Row="4"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        物流公司：
+                    </Label>
                    <!--<TextBox x:Name="txtExpressName" Grid.Row="4" Grid.Column="4" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>-->
-                    <ComboBox x:Name="cmbExpressName" Grid.Row="4" Grid.Column="4" VerticalContentAlignment="Center" VerticalAlignment="Top" IsReadOnly="False" IsEnabled="True"
-                              Style="{StaticResource RoundedComboBox}" Height="28" SelectedIndex="0">
-                    </ComboBox>
+                    <ComboBox
+                        x:Name="cmbExpressName"
+                        Grid.Row="4"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        IsEnabled="True"
+                        IsReadOnly="False"
+                        SelectedIndex="0"
+                        Style="{StaticResource RoundedComboBox}" />

-                    <Label Grid.Row="5" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">寄件地址选择：</Label>
-                    <TextBox x:Name="txtSendAddressAnalysis" Grid.Row="5" Grid.Column="4" BorderBrush="{StaticResource pageColorBrush}" Height="80" BorderThickness="1" Padding="0,4"
-                             Text="上海市普陀区真如镇街道真北路2653弄Z区zt √" Foreground="Green" IsReadOnly="True" Opacity="0.5"
-                             VerticalContentAlignment="Top" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" TextWrapping="Wrap" Margin="0,0,0,15"/>
+                    <Label
+                        Grid.Row="5"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        寄件地址选择：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSendAddressAnalysis"
+                        Grid.Row="5"
+                        Grid.Column="4"
+                        Height="80"
+                        Margin="0,0,0,15"
+                        Padding="0,4"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Top"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Foreground="Green"
+                        IsReadOnly="True"
+                        Opacity="0.5"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}"
+                        Text="真如镇街道真北路2653弄F区808号楼 √"
+                        TextWrapping="Wrap" />

-                    <Label Grid.Row="6" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">寄件人：</Label>
-                    <TextBox x:Name="txtSendUser" Grid.Row="6" Grid.Column="4" BorderBrush="{StaticResource pageColorBrush}"  BorderThickness="1"
-                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="6"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        寄件人：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSendUser"
+                        Grid.Row="6"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label Grid.Row="7" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">寄件人电话：</Label>
-                    <TextBox Grid.Row="7" Grid.Column="4" x:Name="txtSendMobile" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                            Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="7"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        寄件人电话：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSendMobile"
+                        Grid.Row="7"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />

-                    <Label Grid.Column="3" HorizontalAlignment="Right" FontSize="14" Grid.Row="8" Margin="0,0,0,15">寄件省/市/区：</Label>
+                    <Label
+                        Grid.Row="8"
+                        Grid.Column="3"
+                        Margin="0,0,0,15"
+                        HorizontalAlignment="Right"
+                        FontSize="14">
+                        寄件省/市/区：
+                    </Label>
                    <Grid Grid.Row="8" Grid.Column="4">
                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition></ColumnDefinition>
-                            <ColumnDefinition></ColumnDefinition>
-                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
                        </Grid.ColumnDefinitions>
-                        <TextBox x:Name="txtSendProvince" Grid.Row="0" Grid.Column="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                                Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,15"/>
-                        <TextBox x:Name="txtSendCity" Grid.Row="0" Grid.Column="1" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                                Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="2,0,2,15"/>
-                        <TextBox x:Name="txtSendCounty" Grid.Row="0" Grid.Column="2" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                                Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}" Margin="0,0,0,15"/>
+                        <TextBox
+                            x:Name="txtSendProvince"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Height="28"
+                            Margin="0,0,0,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+                        <TextBox
+                            x:Name="txtSendCity"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Height="28"
+                            Margin="2,0,2,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+                        <TextBox
+                            x:Name="txtSendCounty"
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            Height="28"
+                            Margin="0,0,0,15"
+                            VerticalAlignment="Top"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="{StaticResource pageColorBrush}"
+                            BorderThickness="1"
+                            Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
                    </Grid>

-                    <Label Grid.Row="9" Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" FontSize="14">寄件详细地址：</Label>
-                    <TextBox Grid.Row="9" Grid.Column="4" x:Name="txtSendDetailAddress" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
-                             Height="28" VerticalContentAlignment="Center" VerticalAlignment="Top" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
+                    <Label
+                        Grid.Row="9"
+                        Grid.Column="3"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        FontSize="14">
+                        寄件详细地址：
+                    </Label>
+                    <TextBox
+                        x:Name="txtSendDetailAddress"
+                        Grid.Row="9"
+                        Grid.Column="4"
+                        Height="28"
+                        VerticalAlignment="Top"
+                        VerticalContentAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        Style="{StaticResource BaseRoundCornerTextBoxStyle}" />


-                    <Button Grid.Row="10" Grid.Column="4" x:Name="btnAdd" Style="{StaticResource BasePageButtonStyle}" Click="btnAdd_Click" Content="添 加" MinWidth="48" Height="28" 
-                            HorizontalAlignment="Right" VerticalAlignment="Center" Padding="4"/>
-                    <Label x:Name="lblMsg" Grid.Row="10" Grid.Column="1" Grid.ColumnSpan="4" Margin="0,0,70,0" Foreground="{StaticResource PageWarningBrushCC}"></Label>
+                    <Button
+                        x:Name="btnAdd"
+                        Grid.Row="10"
+                        Grid.Column="4"
+                        Height="28"
+                        MinWidth="48"
+                        Padding="4"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Click="btnAdd_Click"
+                        Content="添 加"
+                        Style="{StaticResource BasePageButtonStyle}" />
+                    <Label
+                        x:Name="lblMsg"
+                        Grid.Row="10"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="4"
+                        Margin="0,0,70,0"
+                        Foreground="{StaticResource PageWarningBrushCC}" />

                </Grid>

                <Grid Grid.Column="2">
                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="Auto" MinHeight="40"></RowDefinition>
-                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="Auto" MinHeight="40" />
+                        <RowDefinition Height="*" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition />
                    </Grid.ColumnDefinitions>

-                   
+
                </Grid>
            </Grid>
-            
+
        </Border>
-        <userctrls:UcWindowBoxes x:Name="ucWindowBox" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
+        <userctrls:UcWindowBoxes
+            x:Name="ucWindowBox"
+            Margin="4"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            MaxBoxVisibility="Visible" />
    </Grid>
 </basewindows:BaseWindow>
@@ -1,6 +1,7 @@
 using _29WxOrderWpf.BaseWindows;
 using AllBase;
 using AllBase.Helper;
+using AllBase.Model.Config;
 using AllBase.Model.DBModel;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
@@ -71,7 +72,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 				txtSendProvince.Text = "上海市";
 				txtSendCity.Text = "上海市";
 				txtSendCounty.Text = "普陀区";
-				txtSendDetailAddress.Text = "真如镇街道真北路2653弄Z区zt";
+				txtSendDetailAddress.Text = GlobalConfig.TransitReturnOrderReturnAddress;

 				txtShopOrderId.Text = OrderItem.order_id;
 				txtShopName.Text = OrderItem.ItemOrder?.shop_name;
@@ -107,7 +108,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 			JObject jObj = new JObject();

 			jObj["orderCodeSource"] = OrderItem.order_id;
-			jObj["logisticsCode"] = cmbExpressName.SelectedItem.ParseToString();
+			jObj["logisticsCode"] = PddBuyerOrderLiteInfo.GetPddToTransitWarehouseExpressCompanyCode(cmbExpressName.SelectedItem.ParseToString());
 			jObj["logisticsExpressNo"] = txtWaybillId.Text.Trim();
 			jObj["platform"] = "OTHER";
 			jObj["shopName"] = OrderItem.ItemOrder?.shop_name;
@@ -128,8 +129,14 @@ namespace _29WxOrderWpf.Windows.OrderWindows
 			jObj["platformCode"] = "WEISHOP";
 			jObj["afterSaleNo"] = OrderItem.ItemRefund?.after_sale_order_id;
 			jObj["platformOrderNo"] = OrderItem.order_id;
-			jObj["firstWeightFee"] = OrderItem.ItemTransitOrder.postage;
-			
+
+			string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (txtProvince.Text.Trim()).ParseToString().Contains(pk));
+			decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
+			basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
+
+			jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString();
+			jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString();
+
 			JObject jItemObj = new JObject();
 			jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
 			jItemObj["spuName"] = OrderItem.title;
@@ -169,7 +169,7 @@
    <Compile Include="DouYinModel\Result\DouOrderListInfo.cs" />
    <Compile Include="Model\Config\BuyConfig.cs" />
    <Compile Include="Model\Config\WarehousePostageInfo.cs" />
-    <Compile Include="Model\DBModel\distrib_return_order.cs" />
+    <Compile Include="Model\DBModel\distrib_return_order_info.cs" />
    <Compile Include="Model\DBModel\ErpMerchantInfo.cs" />
    <Compile Include="Model\DBModel\oms_wei_external_procurement_after_sale_info.cs" />
    <Compile Include="Model\DBModel\oms_wei_external_procurement_log_info.cs" />
@@ -36,10 +36,14 @@ namespace AllBase.Helper
        /// 当前拼多多买手
        /// </summary>
        public static BuyerLoginInfo CurrentPddBuyer { get; set; }
-        /// <summary>
-        /// 订单列表
-        /// </summary>
-        public static ConcurrentList<oms_wei_order_info> lstOrder { get; set; } = new ConcurrentList<oms_wei_order_info>();
+		/// <summary>
+		/// 默认退货详细地址
+		/// </summary>
+		public static string TransitReturnOrderReturnAddress { get; set; } = "真如镇街道真北路2653弄F区808号楼";
+		/// <summary>
+		/// 订单列表
+		/// </summary>
+		public static ConcurrentList<oms_wei_order_info> lstOrder { get; set; } = new ConcurrentList<oms_wei_order_info>();
        /// <summary>
        /// 过滤的订单列表
        /// </summary>
@@ -12,8 +12,11 @@ namespace AllBase.Model.DBModel
 	/// <summary>
 	/// 分销退货表
 	/// </summary>
-	public class distrib_return_order : PropertyNotifyObject
+	public class distrib_return_order_info : PropertyNotifyObject
 	{
+		/// <summary>
+		/// 退货主订单唯一ID
+		/// </summary>
 		public long id { get; set; }
 		/// <summary>
 		/// 退货订单编码
@@ -140,7 +143,10 @@ namespace AllBase.Model.DBModel
 		/// 售后单号
 		/// </summary>
 		public string after_sale_no { get; set; }
-
+		/// <summary>
+		///  订单初始费用（分）
+		/// </summary>
+		public int? postage { get; set; }
 		[JsonIgnore]
 		public ObservableCollection<distrib_return_order_item> distrib_return_order_items
 		{
@@ -162,7 +168,7 @@ namespace AllBase.Model.DBModel
 		public int return_quantity { get; set; } = 1;
 		public DateTime updated_at { get; set; }

-		public distrib_return_order distrib_return_order
+		public distrib_return_order_info distrib_return_order
 		{
 			get { return this.GetValue(x => x.distrib_return_order); }
 			set
@@ -221,45 +221,45 @@ namespace AllBase.Model.DBModel
            get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
            set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
        }
-        public void SetTransitOrder()
-        {
+		public void SetTransitOrder()
+		{

 			if (order_id == "3738110521481264129")
 			{

 			}
 			this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
-            this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
-            this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
-            this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
-            // 优先找非撤销买手退款单
-            this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? PddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销");
-            if (PddBuyerAfterSale == null)
-                PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault();
+			this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
+			this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
+			this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
+			// 优先找非撤销买手退款单
+			this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? PddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销");
+			if (PddBuyerAfterSale == null)
+				PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault();

-            // 直接取号和更正取号显示的买手到仓库物流
-            if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
-                this.TransitOrderWaybillToWareHouseStr = null;
-            else
-                this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+			// 直接取号和更正取号显示的买手到仓库物流
+			if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
+				this.TransitOrderWaybillToWareHouseStr = null;
+			else
+				this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;

-            // 提前取号物流
-            if (ItemTransitOrder?.pre_allocated_order_no != 2)
-                this.TransitOrderWaybillFakeStr = null;
-            else
-                this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+			// 提前取号物流
+			if (ItemTransitOrder?.pre_allocated_order_no != 2)
+				this.TransitOrderWaybillFakeStr = null;
+			else
+				this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;

-            // 仓库下游物流
-            if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
-                TransitOrderWaybillFromWareHouseStr = null;
-            else
-                TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
+			// 仓库下游物流
+			if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
+				TransitOrderWaybillFromWareHouseStr = null;
+			else
+				TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;

-            

-            AddEditTransitWarehouseRejectStr = "申请";
-            if (this.ItemTransitOrderWithVoid?.has_reject == 1)
-                AddEditTransitWarehouseRejectStr = "已申请拒收";
+
+			AddEditTransitWarehouseRejectStr = "申请";
+			if (this.ItemTransitOrderWithVoid?.has_reject == 1)
+				AddEditTransitWarehouseRejectStr = "已申请拒收";
 			if (this.ItemTransitOrderWithVoid?.has_reject == 2)
 				AddEditTransitWarehouseRejectStr = "申请拒收失败";
 			if (this.ItemTransitOrderWithVoid?.has_reject == 3)
@@ -267,24 +267,38 @@ namespace AllBase.Model.DBModel
 			if (this.ItemTransitOrderWithVoid?.has_reject == 5)
 				AddEditTransitWarehouseRejectStr = "已取消拒收";
 			if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status >= 2 ||
-                string.IsNullOrEmpty(PddBuyerOrder?.order_sn))
-            {
-                if (AddEditTransitWarehouseRejectStr == "申请")
-                    AddEditTransitWarehouseRejectStr = "";
-            }
+				string.IsNullOrEmpty(PddBuyerOrder?.order_sn))
+			{
+				if (AddEditTransitWarehouseRejectStr == "申请")
+					AddEditTransitWarehouseRejectStr = "";
+			}

-            // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
-            AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
-            if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 1)
-            {
-                if (AddEditTransitWarehouseAfterSaleStr != "已添加")
-                    AddEditTransitWarehouseAfterSaleStr = "";
-            }
-            if (this.ItemTransitOrderAfterSale != null)
-                TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');
+			// 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
+			AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
+			if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 1)
+			{
+				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
+					AddEditTransitWarehouseAfterSaleStr = "";
+			}
+			if (this.ItemTransitOrderAfterSale != null)
+				TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');

-            this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
-        }
+			if (order_id == "3738382691615546112")
+			{
+
+			}
+			AddEditTransitWarehouseReturnOrderStr = "";
+			if (ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)
+			{
+				// 关闭中转包裹退回，改为中转分销退货
+				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
+					AddEditTransitWarehouseAfterSaleStr = "";
+				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
+			}
+
+			// 买手退货地址
+			this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
+		}
        /// <summary>
        /// 仓库拒收按钮文本参数
        /// </summary>
@@ -300,11 +314,27 @@ namespace AllBase.Model.DBModel
        {
            get { return this.GetValue(x => x.AddEditTransitWarehouseAfterSaleStr); }
            set { this.SetValue(x => x.AddEditTransitWarehouseAfterSaleStr, value); }
-        }
-        /// <summary>
-        /// 拍单物流编号
-        /// </summary>
-        public string TransitOrderWaybillToWareHouseStr
+		}
+		/// <summary>
+		/// 仓库分销退货按钮显示文本参数
+		/// </summary>
+		public string AddEditTransitWarehouseReturnOrderStr
+		{
+			get { return this.GetValue(x => x.AddEditTransitWarehouseReturnOrderStr); }
+			set { this.SetValue(x => x.AddEditTransitWarehouseReturnOrderStr, value); }
+		}
+		/// <summary>
+		/// 仓库分销退货物流信息
+		/// </summary>
+		public string AddEditTransitWarehouseReturnOrderWaybillStr
+		{
+			get { return this.GetValue(x => x.AddEditTransitWarehouseReturnOrderWaybillStr); }
+			set { this.SetValue(x => x.AddEditTransitWarehouseReturnOrderWaybillStr, value); }
+		}
+		/// <summary>
+		/// 拍单物流编号
+		/// </summary>
+		public string TransitOrderWaybillToWareHouseStr
        {
            get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
            set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
@@ -713,8 +743,26 @@ namespace AllBase.Model.DBModel
            set { }
        }

+		public List<distrib_return_order_info> DistribReturnOrderInfos
+		{
+			get { return this.GetValue(x => x.DistribReturnOrderInfos); }
+			set 
+			{ 
+				if (value == null)
+					value = new List<distrib_return_order_info>();
+				this.SetValue(x => x.DistribReturnOrderInfos, value);
+				DistribReturnOrderInfo = value.OrderByDescending(dr => dr.created_at).FirstOrDefault(dr => dr.order_void_status == 0);
+				if (DistribReturnOrderInfo != null)
+					AddEditTransitWarehouseReturnOrderWaybillStr = (DistribReturnOrderInfo.real_logistics_code + "-" + DistribReturnOrderInfo.real_logistics_express_code).Trim('-');
+			}
+		}
+		public distrib_return_order_info DistribReturnOrderInfo
+		{
+			get { return this.GetValue(x => x.DistribReturnOrderInfo); }
+			set { this.SetValue(x => x.DistribReturnOrderInfo, value); }
+		}

-        public List<order_pdd_buyer_order> DirectPddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
+		public List<order_pdd_buyer_order> DirectPddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
        public order_pdd_buyer_order DirectPddBuyerOrder
        {
            get { return this.GetValue(x => x.DirectPddBuyerOrder); }
@@ -1161,8 +1209,8 @@ namespace AllBase.Model.DBModel
            //    }));
            //}

-            this.SetTransitOrder();
            this.SetItemRefund();
+            this.SetTransitOrder();
            this.SetDirectOrder();
            this.SetBuyerTransitWaybillStatusStr();
            this.SetWarehouseWaybillStatusStr();
@@ -106,10 +106,10 @@ namespace AllBase.Model.Result
 			if (expressCompanyCode.Contains("YTO")) return "圆通速递";
 			if (expressCompanyCode.Contains("ZTO")) return "中通快递";
 			if (expressCompanyCode.Contains("BTWL")) return "百世快运";
-			if (expressCompanyCode.Contains("顺丰速运")) return "SF";
-			if (expressCompanyCode.Contains("京东快递")) return "JD";
-			if (expressCompanyCode.Contains("京东快运")) return "JDKY";
-			if (expressCompanyCode.Contains("其他快递")) return "OTHER";
+			if (expressCompanyCode.Contains("SF")) return "顺丰速运";
+			if (expressCompanyCode.Contains("JD")) return "京东快递";
+			if (expressCompanyCode.Contains("JDKY")) return "京东快运";
+			if (expressCompanyCode.Contains("OTHER")) return "其他快递";
 			return "其他快递";
 		}