中转订单详情
This commit is contained in:
1 parent
526b009f5e
commit
b466645640
4 files changed
+95
-22
No files matched your search
@@ -2135,23 +2135,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
//if (this.DataContext is oms_wei_order_item_info orderItem)
|
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||||
//{
|
{
|
||||||
// oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
||||||
// {
|
{
|
||||||
// OrderItem = orderItem,
|
OrderItem = orderItem,
|
||||||
// };
|
};
|
||||||
|
|
||||||
// OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo);
|
OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo);
|
||||||
// new DialogWindow()
|
new DialogWindow()
|
||||||
// {
|
{
|
||||||
// Title = "仓库订单详情 - 当前订单 " + orderItem.order_id,
|
Title = "仓库订单详情 - 当前订单 " + orderItem.order_id,
|
||||||
// Content = OrderTransitListCtrl,
|
Content = OrderTransitListCtrl,
|
||||||
// Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
|
Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
|
||||||
// Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
||||||
// WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
||||||
// }.ShowDialog();
|
}.ShowDialog();
|
||||||
//}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,16 @@
|
|||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
Loaded="OrderTransitListCtrl_Loaded"
|
Loaded="OrderTransitListCtrl_Loaded"
|
||||||
mc:Ignorable="d">
|
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>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
|
|||||||
@@ -5,10 +5,21 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:wpf="WPFCommon"
|
||||||
d:DesignHeight="280"
|
d:DesignHeight="280"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
Background="White"
|
Background="White"
|
||||||
mc:Ignorable="d">
|
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
|
<Border
|
||||||
MinHeight="50"
|
MinHeight="50"
|
||||||
Margin="5"
|
Margin="5"
|
||||||
@@ -48,13 +59,64 @@
|
|||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding OrderCode}" />
|
Text="{Binding SourceCode}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</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>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
|
|
||||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
{
|
{
|
||||||
|
TransitTypeStr = "发货包裹",
|
||||||
|
|
||||||
OrderCode = transitOrder.order_code,
|
OrderCode = transitOrder.order_code,
|
||||||
SourceCode = transitOrder.random_code,
|
SourceCode = transitOrder.random_code,
|
||||||
@@ -58,7 +58,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
||||||
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
||||||
BuyReundStatus = transitOrder.refund_status,
|
BuyReundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
|
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
||||||
InboundTime = transitOrder.inbound_time,
|
InboundTime = transitOrder.inbound_time,
|
||||||
OutboundTime = transitOrder.outbound_time,
|
OutboundTime = transitOrder.outbound_time,
|
||||||
};
|
};
|
||||||
@@ -116,10 +117,10 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
set { this.SetValue(x => x.SourceCode, value); }
|
set { this.SetValue(x => x.SourceCode, value); }
|
||||||
}
|
}
|
||||||
/// <summary> 取号时间((中转单)创建时间) </summary>
|
/// <summary> 取号时间((中转单)创建时间) </summary>
|
||||||
public DateTime PickUpTime
|
public DateTime? PickUpTime
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.PickUpTime); }
|
get { return this.GetValue(x => x.PickUpTime); }
|
||||||
set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value.ToString("yyyy-MM-dd HH:mm:ss"); }
|
set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
|
||||||
}
|
}
|
||||||
public string PickUpTimeStr
|
public string PickUpTimeStr
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user