退货包裹批量展示
This commit is contained in:
1 parent
37d879c3e5
commit
f8af5730d3
5 files changed
+476
-258
No files matched your search
@@ -1341,10 +1341,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
isOnsale = 1,
|
isOnsale = 1,
|
||||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
||||||
specs = pddSpecs,
|
specs = pddSpecs,
|
||||||
price = tbSku2.price.priceMoney.ParseToInt() + 100,
|
price = tbSku2.price?.priceMoney.ParseToInt() + 100,
|
||||||
normalPrice = ((tbSku2.price.priceMoney.ParseToInt() + 100) / 100m).ToString("F2"),
|
normalPrice = ((tbSku2.price?.priceMoney.ParseToInt() + 100) / 100m).ParseToDecimal().ToString("F2"),
|
||||||
groupPrice = tbSku2.price.priceText,
|
groupPrice = tbSku2.price?.priceText,
|
||||||
oldGroupPrice = tbSku2.price.priceMoney.ParseToInt(),
|
oldGroupPrice = tbSku2.price?.priceMoney.ParseToInt(),
|
||||||
};
|
};
|
||||||
pddFrontGoods3.skus.Add(pddFrontSkuInfo);
|
pddFrontGoods3.skus.Add(pddFrontSkuInfo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,206 +1,253 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
|
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
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"
|
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>
|
<UserControl.Resources>
|
||||||
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
|
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
|
||||||
<Setter Property="Placement" Value="Left" />
|
<Setter Property="Placement" Value="Left" />
|
||||||
<Setter Property="TitleVerticalAlignment" Value="Center" />
|
<Setter Property="TitleVerticalAlignment" Value="Center" />
|
||||||
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
|
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style TargetType="wpf:SpacingStackPanel">
|
<Style TargetType="wpf:SpacingStackPanel">
|
||||||
<Setter Property="Margin" Value="3,0" />
|
<Setter Property="Margin" Value="3,0" />
|
||||||
</Style>
|
</Style>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<Border
|
<Border
|
||||||
MinHeight="50"
|
MinHeight="50"
|
||||||
Margin="5"
|
Margin="5"
|
||||||
BorderBrush="SkyBlue"
|
BorderBrush="SkyBlue"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="10">
|
CornerRadius="10">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
||||||
<StackPanel MinHeight="30" Orientation="Horizontal">
|
<StackPanel MinHeight="30" Orientation="Horizontal">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="仓库订单号" />
|
Text="仓库订单号" />
|
||||||
<TextBox
|
<TextBox
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
d:Text="261008-123456789012345"
|
d:Text="261008-123456789012345"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding OrderCode}" />
|
Text="{Binding OrderCode}" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="仓库类型"
|
d:Text="发货包裹"
|
||||||
Text="{Binding TransitTypeStr}" />
|
Text="{Binding TransitTypeStr}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
d:Text="261008-123456789012345"
|
d:Text="ABCDEF1"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="DimGray"
|
Foreground="DimGray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding SourceCode}" />
|
Text="{Binding SourceCode}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<Grid Grid.Row="1">
|
<Grid Grid.Row="1">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border
|
<Border
|
||||||
Margin="0,10"
|
Margin="0,10"
|
||||||
BorderBrush="LightSkyBlue"
|
BorderBrush="LightSkyBlue"
|
||||||
BorderThickness="0,0,1,0"
|
BorderThickness="0,0,1,0"
|
||||||
Opacity="0.5">
|
Opacity="0.5">
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
Margin="10,10"
|
Margin="10,10"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
VerticalSpacing="4">
|
VerticalSpacing="4">
|
||||||
<wpf:TitleContent Title="交易单号:">
|
<wpf:TitleContent Title="交易单号:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="371234567890123456"
|
d:Text="371234567890123456"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding WxOrderId}"
|
Text="{Binding WxOrderId}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="买手单号:">
|
<wpf:TitleContent Title="买手单号:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="261008-1234567890123456"
|
d:Text="261008-1234567890123456"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding OutOrderId}"
|
Text="{Binding OutOrderId}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="下单时间:">
|
<wpf:TitleContent Title="下单时间:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="26-10-07 10:33:33"
|
d:Text="26-10-07 10:33:33"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding WxOrderCreateTimeStr}"
|
Text="{Binding WxOrderCreateTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="取号时间:">
|
<wpf:TitleContent Title="添加时间:">
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="26-10-08 00:33:33"
|
d:Text="26-10-07 18:33:33"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding PickUpTimeStr}"
|
Text="{Binding TransitAddTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
</wpf:SpacingStackPanel>
|
<wpf:TitleContent Title="创建时间:">
|
||||||
</Border>
|
<TextBox
|
||||||
<Border
|
d:Text="26-10-08 00:33:33"
|
||||||
Grid.Column="1"
|
Background="Transparent"
|
||||||
Margin="0,10"
|
BorderThickness="0"
|
||||||
BorderBrush="LightSkyBlue"
|
IsReadOnly="True"
|
||||||
BorderThickness="0,0,1,0"
|
Text="{Binding CreateTimeStr}"
|
||||||
Opacity="0.5">
|
TextWrapping="Wrap" />
|
||||||
<wpf:SpacingStackPanel
|
</wpf:TitleContent>
|
||||||
Margin="10,10"
|
<!--<wpf:TitleContent Title="店铺名称:">
|
||||||
VerticalAlignment="Center"
|
<TextBox
|
||||||
Orientation="Vertical"
|
d:Text="芥麦亚"
|
||||||
VerticalSpacing="4">
|
Background="Transparent"
|
||||||
<wpf:TitleContent
|
BorderThickness="0"
|
||||||
Title="{Binding WarehouseName}"
|
IsReadOnly="True"
|
||||||
d:Title="上海仓"
|
Text="{Binding ShopName}"
|
||||||
FontWeight="Bold">
|
TextWrapping="Wrap" />
|
||||||
<TextBox
|
</wpf:TitleContent>-->
|
||||||
d:Text="已出仓"
|
</wpf:SpacingStackPanel>
|
||||||
Background="Transparent"
|
</Border>
|
||||||
BorderThickness="0"
|
<Border
|
||||||
FontWeight="Normal"
|
Grid.Column="1"
|
||||||
IsReadOnly="True"
|
Margin="0,10"
|
||||||
Text="{Binding WarehouseStatus}"
|
BorderBrush="LightSkyBlue"
|
||||||
TextWrapping="Wrap" />
|
BorderThickness="0,0,1,0"
|
||||||
</wpf:TitleContent>
|
Opacity="0.5">
|
||||||
<wpf:TitleContent Title="入库单号:">
|
<wpf:SpacingStackPanel
|
||||||
<TextBox
|
Margin="10,10"
|
||||||
d:Text="JTSD-JT12345678901122"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Orientation="Vertical"
|
||||||
BorderThickness="0"
|
VerticalSpacing="4">
|
||||||
IsReadOnly="True"
|
<wpf:TitleContent
|
||||||
Text="{Binding UpperWaybill}"
|
Title="{Binding WarehouseName}"
|
||||||
TextWrapping="Wrap" />
|
d:Title="上海仓"
|
||||||
</wpf:TitleContent>
|
FontWeight="Bold">
|
||||||
<wpf:TitleContent Title="出库单号:">
|
<WrapPanel>
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="YD-3111111555555123"
|
d:Text="已出仓"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
FontWeight="Normal"
|
||||||
Text="{Binding DownWaybill}"
|
IsReadOnly="True"
|
||||||
TextWrapping="Wrap" />
|
Text="{Binding WarehouseStatus}"
|
||||||
</wpf:TitleContent>
|
TextWrapping="Wrap" />
|
||||||
</wpf:SpacingStackPanel>
|
<TextBox
|
||||||
</Border>
|
d:Text="(已作废)"
|
||||||
<Border
|
Background="Transparent"
|
||||||
Grid.Column="2"
|
BorderThickness="0"
|
||||||
Margin="0,10"
|
FontWeight="Normal"
|
||||||
BorderBrush="LightSkyBlue"
|
IsReadOnly="True"
|
||||||
BorderThickness="0,0,1,0"
|
Text="{Binding TransitVoidStatus}"
|
||||||
Opacity="0.5">
|
TextWrapping="Wrap" />
|
||||||
<wpf:SpacingStackPanel
|
</WrapPanel>
|
||||||
Margin="10,10"
|
|
||||||
VerticalAlignment="Center"
|
</wpf:TitleContent>
|
||||||
Orientation="Vertical"
|
<wpf:TitleContent Title="入库单号:">
|
||||||
VerticalSpacing="4">
|
<TextBox
|
||||||
<wpf:TitleContent Title="到仓时间:">
|
d:Text="JTSD-JT12345678901122"
|
||||||
<TextBox
|
Background="Transparent"
|
||||||
d:Text="26-10-07 10:33:33"
|
BorderThickness="0"
|
||||||
Background="Transparent"
|
IsReadOnly="True"
|
||||||
BorderThickness="0"
|
Text="{Binding UpperWaybill}"
|
||||||
IsReadOnly="True"
|
TextWrapping="Wrap" />
|
||||||
Text="{Binding InboundTimeStr}"
|
</wpf:TitleContent>
|
||||||
TextWrapping="Wrap" />
|
<wpf:TitleContent Title="出库单号:">
|
||||||
</wpf:TitleContent>
|
<TextBox
|
||||||
<wpf:TitleContent Title="取号时间:">
|
d:Text="YD-3111111555555123"
|
||||||
<TextBox
|
Background="Transparent"
|
||||||
d:Text="26-10-08 00:33:33"
|
BorderThickness="0"
|
||||||
Background="Transparent"
|
IsReadOnly="True"
|
||||||
BorderThickness="0"
|
Text="{Binding DownWaybill}"
|
||||||
IsReadOnly="True"
|
TextWrapping="Wrap" />
|
||||||
Text="{Binding PickUpTimeStr}"
|
</wpf:TitleContent>
|
||||||
TextWrapping="Wrap" />
|
<wpf:TitleContent Title="货架号:">
|
||||||
</wpf:TitleContent>
|
<TextBox
|
||||||
<wpf:TitleContent Title="出仓时间:">
|
d:Text="EB3021"
|
||||||
<TextBox
|
Background="Transparent"
|
||||||
d:Text="26-10-07 10:33:33"
|
BorderThickness="0"
|
||||||
Background="Transparent"
|
IsReadOnly="True"
|
||||||
BorderThickness="0"
|
Text="{Binding ShelfCodeStr}"
|
||||||
IsReadOnly="True"
|
TextWrapping="Wrap" />
|
||||||
Text="{Binding OutboundTimeStr}"
|
</wpf:TitleContent>
|
||||||
TextWrapping="Wrap" />
|
<wpf:TitleContent Title="货架记录时间:">
|
||||||
</wpf:TitleContent>
|
<TextBox
|
||||||
</wpf:SpacingStackPanel>
|
d:Text="26-10-08 00:33:33"
|
||||||
</Border>
|
Background="Transparent"
|
||||||
</Grid>
|
BorderThickness="0"
|
||||||
</Grid>
|
IsReadOnly="True"
|
||||||
</Border>
|
Text="{Binding ShelfTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
</wpf:SpacingStackPanel>
|
||||||
|
</Border>
|
||||||
|
<Border
|
||||||
|
Grid.Column="2"
|
||||||
|
Margin="0,10"
|
||||||
|
BorderBrush="LightSkyBlue"
|
||||||
|
BorderThickness="0,0,1,0"
|
||||||
|
Opacity="0.5">
|
||||||
|
<wpf:SpacingStackPanel
|
||||||
|
Margin="10,10"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Orientation="Vertical"
|
||||||
|
VerticalSpacing="4">
|
||||||
|
<wpf:TitleContent Title="到仓时间:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="26-10-07 10:33:33"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding InboundTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="取号时间:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="26-10-08 00:33:33"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding PickUpTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="出仓时间:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="26-10-07 10:33:33"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding OutboundTimeStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
</wpf:SpacingStackPanel>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -97,5 +97,18 @@ namespace AllBase.Model.DBModel
|
|||||||
/// 下游快递公司编码
|
/// 下游快递公司编码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string downstream_express_code { get; set; }
|
public string downstream_express_code { get; set; }
|
||||||
}
|
/// <summary>
|
||||||
|
/// 订单初始费用(分)
|
||||||
|
/// </summary>
|
||||||
|
public int? postage { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架号
|
||||||
|
/// </summary>
|
||||||
|
public string location_code { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架写入时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? location_write_time { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -160,7 +160,7 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 货架写入时间
|
/// 货架写入时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime location_write_time { get; set; }
|
public DateTime? location_write_time { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 虚拟快递单号
|
/// 虚拟快递单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
set
|
set
|
||||||
{
|
{
|
||||||
this.SetValue(x => x.OrderItem, value);
|
this.SetValue(x => x.OrderItem, value);
|
||||||
GetOrderItemTransitDetail();
|
GetOrderItemTransitList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,78 +28,205 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
|
private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
void GetOrderItemTransitDetail()
|
void GetOrderItemTransitList()
|
||||||
|
{
|
||||||
|
List<oms_wei_order_item_transit_detail_info> transitDetailList =
|
||||||
|
[
|
||||||
|
.. GetOrderItemTransitDetailList(),
|
||||||
|
.. GetOrderItemTransitAftersaleList(),
|
||||||
|
];
|
||||||
|
|
||||||
|
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitDetailList()
|
||||||
{
|
{
|
||||||
if (OrderItem == null || OrderItem.ItemOrder == null)
|
if (OrderItem == null || OrderItem.ItemOrder == null)
|
||||||
{
|
{
|
||||||
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>();
|
return new List<oms_wei_order_item_transit_detail_info>();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
List<oms_wei_order_item_transit_detail_info> transitDetailList = new List<oms_wei_order_item_transit_detail_info>();
|
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
|
||||||
|
|
||||||
foreach (var transitOrder in OrderItem.ItemTransitOrders ?? new List<oms_wei_external_procurement_log_info>())
|
foreach (var transitOrder in OrderItem.ItemTransitOrders ?? new List<oms_wei_external_procurement_log_info>())
|
||||||
{
|
{
|
||||||
|
try
|
||||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
|
||||||
{
|
{
|
||||||
TransitTypeStr = "发货包裹",
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
|
{
|
||||||
|
ShopName = OrderItem.ItemOrder.shop_name,
|
||||||
|
|
||||||
OrderCode = transitOrder.order_code,
|
TransitTypeStr = "发货包裹",
|
||||||
SourceCode = transitOrder.random_code,
|
|
||||||
|
|
||||||
WxOrderId = transitOrder.order_no,
|
OrderCode = transitOrder.order_code,
|
||||||
WxOrderSkuId = transitOrder.order_sku_id,
|
SourceCode = transitOrder.random_code,
|
||||||
WxOrderThumbImg = OrderItem.thumb_img,
|
|
||||||
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
|
||||||
|
|
||||||
OutOrderId = transitOrder.out_order_no,
|
WxOrderId = transitOrder.order_no,
|
||||||
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
WxOrderSkuId = transitOrder.order_sku_id,
|
||||||
|
WxOrderThumbImg = OrderItem.thumb_img,
|
||||||
|
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||||
|
|
||||||
//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
TransitAddTimeStr = transitOrder.created_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
|
||||||
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
|
||||||
BuyReundStatus = transitOrder.refund_status,
|
|
||||||
|
|
||||||
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
OutOrderId = transitOrder.out_order_no,
|
||||||
InboundTime = transitOrder.inbound_time,
|
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
||||||
OutboundTime = transitOrder.outbound_time,
|
|
||||||
|
|
||||||
WarehouseId = transitOrder.platform,
|
//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
||||||
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
|
UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
||||||
};
|
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
||||||
|
BuyReundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
||||||
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
CreateTimeStr = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
else
|
InboundTime = transitOrder.inbound_time,
|
||||||
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
OutboundTime = transitOrder.outbound_time,
|
||||||
|
|
||||||
// 中转仓订单创建状态 0 未使用,1 已创建,2 创建失败,3 处理中(业务方根据此字段处理中转流程)
|
WarehouseId = transitOrder.platform,
|
||||||
if (transitOrder.transfer_warehouse_status == 1)
|
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
|
||||||
transitDetail.TransitStatus = "已创建";
|
|
||||||
else if (transitOrder.transfer_warehouse_status == 2)
|
|
||||||
transitDetail.TransitStatus = "创建失败";
|
|
||||||
else if (transitOrder.transfer_warehouse_status == 3)
|
|
||||||
transitDetail.TransitStatus = "创建中";
|
|
||||||
|
|
||||||
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
|
ShelfCodeStr = transitOrder.location_code,
|
||||||
if (transitOrder.warehouse_status == 0)
|
ShelfTimeStr = transitOrder.location_write_time == null ? "" : transitOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
transitDetail.WarehouseStatus = "已创建";
|
};
|
||||||
else if (transitOrder.warehouse_status == 1)
|
|
||||||
transitDetail.WarehouseStatus = "已入库";
|
|
||||||
else if (transitOrder.warehouse_status == 2)
|
|
||||||
transitDetail.WarehouseStatus = "已出库";
|
|
||||||
else if (transitOrder.warehouse_status == 3)
|
|
||||||
transitDetail.WarehouseStatus = "已拦截到仓";
|
|
||||||
|
|
||||||
transitDetailList.Add(transitDetail);
|
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
||||||
|
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
||||||
|
else
|
||||||
|
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
||||||
|
|
||||||
|
// 中转仓订单创建状态 0 未使用,1 已创建,2 创建失败,3 处理中(业务方根据此字段处理中转流程)
|
||||||
|
if (transitOrder.transfer_warehouse_status == 1)
|
||||||
|
transitDetail.TransitStatus = "已创建";
|
||||||
|
else if (transitOrder.transfer_warehouse_status == 2)
|
||||||
|
transitDetail.TransitStatus = "创建失败";
|
||||||
|
else if (transitOrder.transfer_warehouse_status == 3)
|
||||||
|
transitDetail.TransitStatus = "创建中";
|
||||||
|
|
||||||
|
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
|
||||||
|
if (transitOrder.warehouse_status == 0)
|
||||||
|
transitDetail.WarehouseStatus = "已创建";
|
||||||
|
else if (transitOrder.warehouse_status == 1)
|
||||||
|
transitDetail.WarehouseStatus = "已入库";
|
||||||
|
else if (transitOrder.warehouse_status == 2)
|
||||||
|
transitDetail.WarehouseStatus = "已出库";
|
||||||
|
else if (transitOrder.warehouse_status == 3)
|
||||||
|
transitDetail.WarehouseStatus = "已拦截到仓";
|
||||||
|
|
||||||
|
if (transitOrder.order_void_status == 1)
|
||||||
|
transitDetail.TransitVoidStatus = "(已作废)";
|
||||||
|
//else if (transitOrder.order_void_status == 2)
|
||||||
|
// transitDetail.TransitVoidStatus = "(作废失败)";
|
||||||
|
|
||||||
|
detailList.Add(transitDetail);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return detailList;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitAftersaleList()
|
||||||
|
{
|
||||||
|
if (OrderItem == null || OrderItem.ItemOrder == null)
|
||||||
|
{
|
||||||
|
return new List<oms_wei_order_item_transit_detail_info>();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
|
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
|
||||||
|
|
||||||
|
foreach (var transitAftersaleOrder in OrderItem.ItemTransitOrderAfterSales ?? new List<oms_wei_external_procurement_after_sale_info>())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
|
||||||
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
|
{
|
||||||
|
ShopName = OrderItem.ItemOrder.shop_name,
|
||||||
|
|
||||||
|
//TransitTypeStr = "拦截退回",
|
||||||
|
TransitTypeStr = "退货包裹",
|
||||||
|
|
||||||
|
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
|
||||||
|
SourceCode = transitOrder?.random_code,
|
||||||
|
|
||||||
|
WxOrderId = transitAftersaleOrder.order_no,
|
||||||
|
WxOrderSkuId = transitOrder?.order_sku_id,
|
||||||
|
WxOrderThumbImg = OrderItem.thumb_img,
|
||||||
|
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||||
|
|
||||||
|
TransitAddTimeStr = transitAftersaleOrder.created_time == null ? "" : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
|
||||||
|
OutOrderId = transitOrder?.out_order_no,
|
||||||
|
OutBuyerName = transitOrder?.OutOrderBuyerStr,
|
||||||
|
|
||||||
|
UpperWaybill = (transitAftersaleOrder.return_express_company + "-" + transitAftersaleOrder.refund_waybill).Trim('-'),
|
||||||
|
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
|
||||||
|
BuyReundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
|
// 售后暂时缺少取号时间
|
||||||
|
//PickUpTime = transitAftersaleOrder.pickup_time == DateTime.MinValue ? null : transitAftersaleOrder.pickup_time,
|
||||||
|
CreateTimeStr = transitAftersaleOrder.created_time == null ? null : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
InboundTime = transitAftersaleOrder.inbound_time,
|
||||||
|
OutboundTime = transitAftersaleOrder.outbound_time,
|
||||||
|
|
||||||
|
WarehouseId = transitOrder?.platform,
|
||||||
|
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
|
||||||
|
|
||||||
|
ShelfCodeStr = transitAftersaleOrder.location_code,
|
||||||
|
ShelfTimeStr = transitAftersaleOrder.location_write_time == null ? "" : transitAftersaleOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
||||||
|
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
|
||||||
|
else
|
||||||
|
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
|
||||||
|
|
||||||
|
// 售后处理状态,0未处理,1处理中,2已完成,9异常
|
||||||
|
if (transitAftersaleOrder.status == 1)
|
||||||
|
transitDetail.TransitStatus = "处理中";
|
||||||
|
if (transitAftersaleOrder.status == 1)
|
||||||
|
transitDetail.TransitStatus = "处理中";
|
||||||
|
else if (transitAftersaleOrder.status == 2)
|
||||||
|
transitDetail.TransitStatus = "已完成";
|
||||||
|
else if (transitAftersaleOrder.status == 9)
|
||||||
|
transitDetail.TransitStatus = "异常";
|
||||||
|
|
||||||
|
// 售后入库状态 1=入库 2=出库
|
||||||
|
if (transitAftersaleOrder.warehouse_status == 0)
|
||||||
|
transitDetail.WarehouseStatus = "已创建";
|
||||||
|
else if (transitAftersaleOrder.warehouse_status == 1)
|
||||||
|
transitDetail.WarehouseStatus = "已入库";
|
||||||
|
else if (transitAftersaleOrder.warehouse_status == 2)
|
||||||
|
transitDetail.WarehouseStatus = "已出库";
|
||||||
|
else if (transitAftersaleOrder.warehouse_status == 3)
|
||||||
|
transitDetail.WarehouseStatus = "已拦截到仓";
|
||||||
|
|
||||||
|
// 售后暂时没有作废状态
|
||||||
|
//if (transitAftersaleOrder.order_void_status == 1)
|
||||||
|
// transitDetail.TransitVoidStatus = "(已作废)";
|
||||||
|
//else if (transitOrder.order_void_status == 2)
|
||||||
|
// transitDetail.TransitVoidStatus = "(作废失败)";
|
||||||
|
|
||||||
|
detailList.Add(transitDetail);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return detailList;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||||
{
|
{
|
||||||
|
public string ShopName
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShopName); }
|
||||||
|
set { this.SetValue(x => x.ShopName, value); }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库类型 发货包裹 退货包裹
|
/// 仓库类型 发货包裹 退货包裹
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -130,6 +257,11 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
get { return this.GetValue(x => x.WarehouseName); }
|
get { return this.GetValue(x => x.WarehouseName); }
|
||||||
set { this.SetValue(x => x.WarehouseName, value); }
|
set { this.SetValue(x => x.WarehouseName, value); }
|
||||||
}
|
}
|
||||||
|
public string CreateTimeStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.CreateTimeStr); }
|
||||||
|
set { this.SetValue(x => x.CreateTimeStr, value); }
|
||||||
|
}
|
||||||
/// <summary> 取号时间((中转单)创建时间) </summary>
|
/// <summary> 取号时间((中转单)创建时间) </summary>
|
||||||
public DateTime? PickUpTime
|
public DateTime? PickUpTime
|
||||||
{
|
{
|
||||||
@@ -164,6 +296,14 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
get { return this.GetValue(x => x.WxOrderCreateTimeStr); }
|
get { return this.GetValue(x => x.WxOrderCreateTimeStr); }
|
||||||
set { this.SetValue(x => x.WxOrderCreateTimeStr, value); }
|
set { this.SetValue(x => x.WxOrderCreateTimeStr, value); }
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 添加记录时间
|
||||||
|
/// </summary>
|
||||||
|
public string TransitAddTimeStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.TransitAddTimeStr); }
|
||||||
|
set { this.SetValue(x => x.TransitAddTimeStr, value); }
|
||||||
|
}
|
||||||
public string WxOrderThumbImg
|
public string WxOrderThumbImg
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.WxOrderThumbImg); }
|
get { return this.GetValue(x => x.WxOrderThumbImg); }
|
||||||
@@ -198,6 +338,12 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
get { return this.GetValue(x => x.WarehouseStatus); }
|
get { return this.GetValue(x => x.WarehouseStatus); }
|
||||||
set { this.SetValue(x => x.WarehouseStatus, value); }
|
set { this.SetValue(x => x.WarehouseStatus, value); }
|
||||||
}
|
}
|
||||||
|
/// <summary> 作废状态 </summary>
|
||||||
|
public string TransitVoidStatus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.TransitVoidStatus); }
|
||||||
|
set { this.SetValue(x => x.TransitVoidStatus, value); }
|
||||||
|
}
|
||||||
/// <summary> 买手退货状态 </summary>
|
/// <summary> 买手退货状态 </summary>
|
||||||
public string BuyReundStatus
|
public string BuyReundStatus
|
||||||
{
|
{
|
||||||
@@ -246,4 +392,16 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
get { return this.GetValue(x => x.OutboundTimeStr); }
|
get { return this.GetValue(x => x.OutboundTimeStr); }
|
||||||
set { this.SetValue(x => x.OutboundTimeStr, value); }
|
set { this.SetValue(x => x.OutboundTimeStr, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ShelfCodeStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShelfCodeStr); }
|
||||||
|
set { this.SetValue(x => x.ShelfCodeStr, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ShelfTimeStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShelfTimeStr); }
|
||||||
|
set { this.SetValue(x => x.ShelfTimeStr, value); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user