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

2026-10-26 14:50:23 +08:00
commit 39cf75fcbb
@@ -364,6 +364,7 @@
 								RowHeaderWidth="0"
 								RowHeight="50"
 								SelectionChanged="dgBuyerOrder_SelectionChanged"
+								SelectionUnit="Cell"
 								VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
 								<DataGrid.Columns>
 									<DataGridTextColumn
@@ -382,7 +383,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.6*"
-										Binding="{Binding WxSendTypeStr}"
+										Binding="{Binding WxSendTypeStr, Mode=OneWay}"
 										Header="是否直发">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -394,7 +395,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.5*"
-										Binding="{Binding order_sn}"
+										Binding="{Binding order_sn, Mode=OneWay}"
 										Header="拍单订单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -406,7 +407,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.5*"
-										Binding="{Binding ShopOrderIdStr}"
+										Binding="{Binding ShopOrderIdStr, Mode=OneWay}"
 										Header="店铺订单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -418,7 +419,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding buyerName}"
+										Binding="{Binding buyerName, Mode=OneWay}"
 										Header="买手名称">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -430,7 +431,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.8*"
-										Binding="{Binding OrderTimeStr}"
+										Binding="{Binding OrderTimeStr, Mode=OneWay}"
 										Header="拍单时间">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -442,7 +443,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.8*"
-										Binding="{Binding ProdInfoStr}"
+										Binding="{Binding ProdInfoStr, Mode=OneWay}"
 										Header="商品信息">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -454,7 +455,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.8*"
-										Binding="{Binding AmoutValue}"
+										Binding="{Binding AmoutValue, Mode=OneWay}"
 										Header="金额">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -466,7 +467,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding order_status_prompt}"
+										Binding="{Binding order_status_prompt, Mode=OneWay}"
 										Header="订单状态">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -478,7 +479,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding outExpressCompanyCode}"
+										Binding="{Binding outExpressCompanyCode, Mode=OneWay}"
 										Header="物流名称">
 										<!--  outExpressCompanyName  -->
 										<DataGridTextColumn.ElementStyle>
@@ -491,7 +492,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding tracking_number}"
+										Binding="{Binding tracking_number, Mode=OneWay}"
 										Header="物流单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -503,7 +504,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding sendStatus}"
+										Binding="{Binding sendStatus, Mode=OneWay}"
 										Header="订单信息">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -533,7 +534,7 @@
 														Click="btnSendBuyerOrder_Click"
 														Content="发送"
 														Foreground="{StaticResource PageLinkBrush}"
-														Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}" />
+														Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}" />
 													<Button
 														x:Name="btnSendDirectBuyerOrder"
 														Grid.Row="2"
@@ -546,7 +547,7 @@
 														Click="btnSendBuyerOrder_Click"
 														Content="发送"
 														Foreground="{StaticResource PageLinkBrush}"
-														Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}}" />
+														Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}" />
 													<!--  直发单直发标注不为空  -->
 												</Grid>
 											</DataTemplate>
@@ -568,11 +569,12 @@
 								LoadingRow="dgBuyerOrder_LoadingRow"
 								RowHeaderWidth="0"
 								RowHeight="50"
+								SelectionUnit="Cell"
 								VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
 								<DataGrid.Columns>
 									<DataGridTextColumn
 										Width="40"
-										Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
+										Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}, Mode=OneWay}"
 										CanUserSort="False"
 										Header="序列"
 										IsReadOnly="True">
@@ -586,7 +588,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.6*"
-										Binding="{Binding WxSendTypeStr}"
+										Binding="{Binding WxSendTypeStr, Mode=OneWay}"
 										Header="是否直发">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -598,7 +600,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.5*"
-										Binding="{Binding afterSalesId}"
+										Binding="{Binding afterSalesId, Mode=OneWay}"
 										Header="售后单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -610,7 +612,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.5*"
-										Binding="{Binding orderSn}"
+										Binding="{Binding orderSn, Mode=OneWay}"
 										Header="拍单订单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -622,7 +624,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.5*"
-										Binding="{Binding ShopOrderIdStr}"
+										Binding="{Binding ShopOrderIdStr, Mode=OneWay}"
 										Header="店铺订单号">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -634,7 +636,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding buyerName}"
+										Binding="{Binding buyerName, Mode=OneWay}"
 										Header="买手名称">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -646,7 +648,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.8*"
-										Binding="{Binding orderDate}"
+										Binding="{Binding orderDate, Mode=OneWay}"
 										Header="拍单日期">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -658,7 +660,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1.8*"
-										Binding="{Binding ProdInfoStr}"
+										Binding="{Binding ProdInfoStr, Mode=OneWay}"
 										Header="商品信息">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -670,7 +672,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.8*"
-										Binding="{Binding OrderAmountValue}"
+										Binding="{Binding OrderAmountValue, Mode=OneWay}"
 										Header="订单金额">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -682,7 +684,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="0.8*"
-										Binding="{Binding RefundAmountValue}"
+										Binding="{Binding RefundAmountValue, Mode=OneWay}"
 										Header="售后金额">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -694,7 +696,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding AfterSaleStatusStr}"
+										Binding="{Binding AfterSaleStatusStr, Mode=OneWay}"
 										Header="售后状态">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -706,7 +708,7 @@
 									</DataGridTextColumn>
 									<DataGridTextColumn
 										Width="1*"
-										Binding="{Binding sendStatus}"
+										Binding="{Binding sendStatus, Mode=OneWay}"
 										Header="订单信息">
 										<DataGridTextColumn.ElementStyle>
 											<Style TargetType="TextBlock">
@@ -721,7 +723,7 @@
                                            <DataTemplate>
                                                <Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center"
                                                        Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"
-                                                        Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button>
+                                                        Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}"></Button>
                                            </DataTemplate>
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>-->
@@ -33,7 +33,6 @@ using Work;
 using Work._29Tools.BLL;
 using Work._29Tools.CefTools;
 using Work.BaseForms;
-using WxOrder.Framework.Commons;
 using WxOrder.Framework.Helpers;
 using static AllBase.DouYinModel.Result.DouOrderListInfo;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
@@ -361,7 +361,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls

 			while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
 			{
-				BottomMsg = "当前正在读取订单...，第" + (page + 1) + "页" + (hasGetPage ? "" : ("/共" + totalPage + "页"));
+				BottomMsg = "当前正在读取订单...，第" + (page + 1) + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页"));
 				if (page >= totalPage)
 				{
 					break;
@@ -554,7 +554,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 							else
 								item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
 							// 中转仓退货包裹订单
-							if (item.order_id == "3739241588056569856")
+							if (item.order_id == "3740040052771291904")
 							{

 							}
@@ -1011,7 +1011,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
 					return pddBuyerAfterSales;
 				}
-				catch
+				catch (Exception ex)
 				{
 				}
 			}
@@ -1138,6 +1138,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 		{
 			foreach (var shop in GlobalConfig.ShopLoginList)
 			{
+				var index = GlobalConfig.ShopLoginList.IndexOf(shop);
 				if (shop.LoginStatus == "登录成功")
 					ShopBLL.CheckShopLogin(shop);
 				if (shop.LoginStatus != "登录成功")
@@ -1257,7 +1258,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 									orderItem.OrderItemExt = orderExt;

 									InitOrderObservableProp(order);
-									MainWindow.Instance.orderListCtrl.FilterOneOrder(order, true);
+									MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
 								}
 							}
 						}
@@ -1267,6 +1268,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 						BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + ex.Message, "Error", 5);
 					}
 				}
+				disPlayOrderTabOrderCount();
 			}
 		}

@@ -646,6 +646,8 @@
 						BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
 						BorderThickness="1"
 						CornerRadius="2"
+						Cursor="Hand"
+						MouseUp="borderWarehouseStatas_MouseUp"
 						Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
 						<TextBlock
 							x:Name="txtWarehouseStatus"
@@ -778,6 +780,7 @@
 						Margin="-2,0"
 						Padding="0"
 						VerticalAlignment="Top"
+						d:Text="2026-10-09 15:59:59"
 						Background="Transparent"
 						BorderThickness="0"
 						Foreground="{Binding OutOrderTimeQualifiedBrush}"
@@ -796,6 +799,7 @@
 						Margin="-2,0"
 						Padding="0"
 						VerticalAlignment="Top"
+						d:Text="JTSD-JT12345678"
 						Background="Transparent"
 						BorderThickness="0"
 						Foreground="{StaticResource PageOkBrush}"
@@ -827,6 +831,7 @@
 							Margin="-2,0"
 							Padding="0"
 							VerticalAlignment="Center"
+							d:Text="YD-3123456789999"
 							Background="Transparent"
 							BorderThickness="0"
 							IsReadOnly="True"
@@ -2132,6 +2132,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				}.ShowDialog();
 			}
 		}
+
+		private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs 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()
+				{
+					OrderItem = orderItem,
+				};
+
+				OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo);
+				new DialogWindow()
+				{
+					Title = "仓库订单详情 - 当前订单 " + orderItem.order_id,
+					Content = OrderTransitListCtrl,
+					Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
+					Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
+					WindowStartupLocation = WindowStartupLocation.CenterScreen,
+				}.ShowDialog();
+			}
+		}
 	}
 }

@@ -0,0 +1,85 @@
+<UserControl
+	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListCtrl"
+	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="450"
+	d:DesignWidth="800"
+	Background="White"
+	Foreground="DimGray"
+	Loaded="OrderTransitListCtrl_Loaded"
+	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>
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+		<StackPanel Height="30" Orientation="Horizontal">
+			<TextBlock
+				Margin="10,0,0,0"
+				VerticalAlignment="Center"
+				Text="店铺：" />
+			<TextBox
+				VerticalContentAlignment="Center"
+				d:Text="音诉云仓"
+				Background="Transparent"
+				BorderThickness="0"
+				Foreground="DimGray"
+				IsReadOnly="True"
+				Text="{Binding ShopNameStr}" />
+			<TextBlock
+				Margin="10,0,0,0"
+				VerticalAlignment="Center"
+				Text="订单号：" />
+			<TextBox
+				VerticalContentAlignment="Center"
+				d:Text="3700000000000000"
+				Background="Transparent"
+				BorderThickness="0"
+				Foreground="DimGray"
+				IsReadOnly="True"
+				Text="{Binding OrderIdStr}" />
+		</StackPanel>
+		<ListBox
+			x:Name="lbxTransitList"
+			Grid.Row="4"
+			Margin="7,0,7,0"
+			HorizontalContentAlignment="Stretch"
+			BorderThickness="0">
+			<!--  使用自定义属性模板去除ListBox高亮显示框  -->
+			<ListBox.ItemContainerStyle>
+				<Style TargetType="ListBoxItem">
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="ListBoxItem">
+								<ContentPresenter
+									Content="{TemplateBinding Content}"
+									ContentStringFormat="{TemplateBinding ContentStringFormat}"
+									ContentTemplate="{TemplateBinding ContentTemplate}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</ListBox.ItemContainerStyle>
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<!--  此处绑定将数据源传递给子自定义控件  -->
+					<local:OrderTransitListDetailCtrl DataContext="{Binding}" />
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+	</Grid>
+</UserControl>
@@ -0,0 +1,59 @@
+using AllBase.Model.DBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace _29WxOrderWpf.Ctrls.OrderCtrls;
+
+/// <summary>
+/// OrderTransitListCtrl.xaml 的交互逻辑
+/// </summary>
+public partial class OrderTransitListCtrl : UserControl
+{
+	OrderTransitListCtrlViewModel ViewModel;
+
+	public OrderTransitListCtrl(oms_wei_order_item_transit_info transitInfo)
+	{
+		InitializeComponent();
+
+		ViewModel = new OrderTransitListCtrlViewModel(transitInfo);
+		ViewModel.RequestClose += ViewModel_RequestClose;
+
+		DataContext = ViewModel;
+		this.lbxTransitList.ItemsSource = ViewModel.TransitInfo.OrderItemTransitDetailList;
+	}
+
+	private void ViewModel_RequestClose()
+	{
+		Window parentWindow = Window.GetWindow(this);
+		if (this.IsLoaded && parentWindow != null)
+			parentWindow.Close();
+	}
+
+	private void OrderTransitListCtrl_Loaded(object sender, RoutedEventArgs e)
+	{
+		Window parentWindow = Window.GetWindow(this);
+		if (parentWindow != null)
+		{
+			parentWindow.Closed += ChangeWaybillView_Closed;
+		}
+		ViewModel.Start();
+	}
+
+	private void ChangeWaybillView_Closed(object sender, EventArgs e)
+	{
+		ViewModel.Stop();
+	}
+
+}
@@ -0,0 +1,62 @@
+using AllBase.Model.DBModel;
+using AllBase.Model.MvvmBaseClasses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace _29WxOrderWpf.Ctrls.OrderCtrls;
+
+public class OrderTransitListCtrlViewModel : PropertyNotifyObject
+{
+	private volatile bool _isWindowLoaded = false;
+
+	public oms_wei_order_item_transit_info TransitInfo 
+	{
+		get { return this.GetValue(x => x.TransitInfo); }
+		set { this.SetValue(x => x.TransitInfo, value); }
+	}
+	public oms_wei_order_item_info OrderItem
+	{
+		get { return this.GetValue(x => x.OrderItem); }
+		set { this.SetValue(x => x.OrderItem, value); }
+	}
+	public string OrderIdStr
+	{
+		get { return this.GetValue(x => x.OrderIdStr); }
+		set { this.SetValue(x => x.OrderIdStr, value); }
+	}
+	public string ShopNameStr
+	{
+		get { return this.GetValue(x => x.ShopNameStr); }
+		set { this.SetValue(x => x.ShopNameStr, value); }
+	}
+
+
+	/// <summary>请求关闭窗口</summary>
+	public event Action RequestClose;
+
+	public OrderTransitListCtrlViewModel(oms_wei_order_item_transit_info transitInfo)
+	{
+		TransitInfo = transitInfo;
+		OrderItem = transitInfo?.OrderItem;
+		OrderIdStr = OrderItem?.order_id;
+		ShopNameStr = OrderItem?.ItemOrder?.Shop?.ShopAccount;
+	}
+
+	/// <summary>
+	/// 窗口加载完成时调用
+	/// </summary>
+	public void Start()
+	{
+		_isWindowLoaded = true;
+	}
+	/// <summary>
+	/// 窗口关闭时调用，停止后台任务
+	/// </summary>
+	public void Stop()
+	{
+		_isWindowLoaded = false;
+	}
+}
@@ -0,0 +1,167 @@
+<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>
+
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace _29WxOrderWpf.Ctrls.OrderCtrls;
+
+/// <summary>
+/// OrderTransitListDetailCtrl.xaml 的交互逻辑
+/// </summary>
+public partial class OrderTransitListDetailCtrl : UserControl
+{
+	public OrderTransitListDetailCtrl()
+	{
+		InitializeComponent();
+	}
+}
@@ -39,10 +39,15 @@ public partial class ChangeWaybillView : UserControl

 	private void ChangeWaybillView_Loaded(object sender, RoutedEventArgs e)
 	{
+		Window parentWindow = Window.GetWindow(this);
+		if (parentWindow != null)
+		{
+			parentWindow.Closed += ChangeWaybillView_Closed;
+		}
 		ViewModel.Start();
 	}

-	private void ChangeWaybillView_Closed(object sender, RoutedEventArgs e)
+	private void ChangeWaybillView_Closed(object sender, EventArgs e)
 	{
 		ViewModel.Stop();
 	}