退货包裹批量展示
This commit is contained in:
wule committed
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,
|
||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异，包含冒号与父类型id
|
||||
specs = pddSpecs,
|
||||
price = tbSku2.price.priceMoney.ParseToInt() + 100,
|
||||
normalPrice = ((tbSku2.price.priceMoney.ParseToInt() + 100) / 100m).ToString("F2"),
|
||||
groupPrice = tbSku2.price.priceText,
|
||||
oldGroupPrice = tbSku2.price.priceMoney.ParseToInt(),
|
||||
price = tbSku2.price?.priceMoney.ParseToInt() + 100,
|
||||
normalPrice = ((tbSku2.price?.priceMoney.ParseToInt() + 100) / 100m).ParseToDecimal().ToString("F2"),
|
||||
groupPrice = tbSku2.price?.priceText,
|
||||
oldGroupPrice = tbSku2.price?.priceMoney.ParseToInt(),
|
||||
};
|
||||
pddFrontGoods3.skus.Add(pddFrontSkuInfo);
|
||||
}
|
||||
|
||||
@@ -1,206 +1,253 @@
|
||||
<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 WarehouseStatus}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="入库单号：">
|
||||
<TextBox
|
||||
d:Text="JTSD-JT12345678901122"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding UpperWaybill}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="出库单号：">
|
||||
<TextBox
|
||||
d:Text="YD-3111111555555123"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DownWaybill}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
</wpf: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>
|
||||
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="ABCDEF1"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="DimGray"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding SourceCode}" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</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-07 18:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding TransitAddTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="创建时间：">
|
||||
<TextBox
|
||||
d:Text="26-10-08 00:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding CreateTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<!--<wpf:TitleContent Title="店铺名称：">
|
||||
<TextBox
|
||||
d:Text="芥麦亚"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding ShopName}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>-->
|
||||
</wpf:SpacingStackPanel>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Column="1"
|
||||
Margin="0,10"
|
||||
BorderBrush="LightSkyBlue"
|
||||
BorderThickness="0,0,1,0"
|
||||
Opacity="0.5">
|
||||
<wpf:SpacingStackPanel
|
||||
Margin="10,10"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="4">
|
||||
<wpf:TitleContent
|
||||
Title="{Binding WarehouseName}"
|
||||
d:Title="上海仓"
|
||||
FontWeight="Bold">
|
||||
<WrapPanel>
|
||||
<TextBox
|
||||
d:Text="已出仓"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
FontWeight="Normal"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding WarehouseStatus}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBox
|
||||
d:Text="(已作废)"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
FontWeight="Normal"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding TransitVoidStatus}"
|
||||
TextWrapping="Wrap" />
|
||||
</WrapPanel>
|
||||
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="入库单号：">
|
||||
<TextBox
|
||||
d:Text="JTSD-JT12345678901122"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding UpperWaybill}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="出库单号：">
|
||||
<TextBox
|
||||
d:Text="YD-3111111555555123"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DownWaybill}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="货架号：">
|
||||
<TextBox
|
||||
d:Text="EB3021"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding ShelfCodeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="货架记录时间：">
|
||||
<TextBox
|
||||
d:Text="26-10-08 00:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding ShelfTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
</wpf:SpacingStackPanel>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Column="2"
|
||||
Margin="0,10"
|
||||
BorderBrush="LightSkyBlue"
|
||||
BorderThickness="0,0,1,0"
|
||||
Opacity="0.5">
|
||||
<wpf:SpacingStackPanel
|
||||
Margin="10,10"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="4">
|
||||
<wpf:TitleContent Title="到仓时间：">
|
||||
<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>
|
||||
@@ -97,5 +97,18 @@ namespace AllBase.Model.DBModel
|
||||
/// 下游快递公司编码
|
||||
/// </summary>
|
||||
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>
|
||||
public DateTime location_write_time { get; set; }
|
||||
public DateTime? location_write_time { get; set; }
|
||||
/// <summary>
|
||||
/// 虚拟快递单号
|
||||
/// </summary>
|
||||
|
||||
@@ -18,7 +18,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
set
|
||||
{
|
||||
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); }
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>();
|
||||
return;
|
||||
return new List<oms_wei_order_item_transit_detail_info>();
|
||||
}
|
||||
|
||||
List<oms_wei_order_item_transit_detail_info> transitDetailList = new List<oms_wei_order_item_transit_detail_info>();
|
||||
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
|
||||
|
||||
foreach (var transitOrder in OrderItem.ItemTransitOrders ?? new List<oms_wei_external_procurement_log_info>())
|
||||
{
|
||||
|
||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||
try
|
||||
{
|
||||
TransitTypeStr = "发货包裹",
|
||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||
{
|
||||
ShopName = OrderItem.ItemOrder.shop_name,
|
||||
|
||||
OrderCode = transitOrder.order_code,
|
||||
SourceCode = transitOrder.random_code,
|
||||
TransitTypeStr = "发货包裹",
|
||||
|
||||
WxOrderId = transitOrder.order_no,
|
||||
WxOrderSkuId = transitOrder.order_sku_id,
|
||||
WxOrderThumbImg = OrderItem.thumb_img,
|
||||
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||
OrderCode = transitOrder.order_code,
|
||||
SourceCode = transitOrder.random_code,
|
||||
|
||||
OutOrderId = transitOrder.out_order_no,
|
||||
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
||||
WxOrderId = transitOrder.order_no,
|
||||
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('-'),
|
||||
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,
|
||||
TransitAddTimeStr = transitOrder.created_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
|
||||
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
||||
InboundTime = transitOrder.inbound_time,
|
||||
OutboundTime = transitOrder.outbound_time,
|
||||
OutOrderId = transitOrder.out_order_no,
|
||||
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
||||
|
||||
WarehouseId = transitOrder.platform,
|
||||
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
|
||||
};
|
||||
//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
||||
UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
||||
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
||||
BuyReundStatus = transitOrder.refund_status,
|
||||
|
||||
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 ?? "";
|
||||
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
||||
CreateTimeStr = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
InboundTime = transitOrder.inbound_time,
|
||||
OutboundTime = transitOrder.outbound_time,
|
||||
|
||||
// 中转仓订单创建状态 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 = "创建中";
|
||||
WarehouseId = transitOrder.platform,
|
||||
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
|
||||
|
||||
// 中转仓入库状态 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 = "已拦截到仓";
|
||||
ShelfCodeStr = transitOrder.location_code,
|
||||
ShelfTimeStr = transitOrder.location_write_time == null ? "" : transitOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
};
|
||||
|
||||
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 string ShopName
|
||||
{
|
||||
get { return this.GetValue(x => x.ShopName); }
|
||||
set { this.SetValue(x => x.ShopName, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 仓库类型 发货包裹 退货包裹
|
||||
/// </summary>
|
||||
@@ -130,6 +257,11 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.WarehouseName); }
|
||||
set { this.SetValue(x => x.WarehouseName, value); }
|
||||
}
|
||||
public string CreateTimeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.CreateTimeStr); }
|
||||
set { this.SetValue(x => x.CreateTimeStr, value); }
|
||||
}
|
||||
/// <summary> 取号时间((中转单)创建时间) </summary>
|
||||
public DateTime? PickUpTime
|
||||
{
|
||||
@@ -164,6 +296,14 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.WxOrderCreateTimeStr); }
|
||||
set { this.SetValue(x => x.WxOrderCreateTimeStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 添加记录时间
|
||||
/// </summary>
|
||||
public string TransitAddTimeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitAddTimeStr); }
|
||||
set { this.SetValue(x => x.TransitAddTimeStr, value); }
|
||||
}
|
||||
public string WxOrderThumbImg
|
||||
{
|
||||
get { return this.GetValue(x => x.WxOrderThumbImg); }
|
||||
@@ -198,6 +338,12 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.WarehouseStatus); }
|
||||
set { this.SetValue(x => x.WarehouseStatus, value); }
|
||||
}
|
||||
/// <summary> 作废状态 </summary>
|
||||
public string TransitVoidStatus
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitVoidStatus); }
|
||||
set { this.SetValue(x => x.TransitVoidStatus, value); }
|
||||
}
|
||||
/// <summary> 买手退货状态 </summary>
|
||||
public string BuyReundStatus
|
||||
{
|
||||
@@ -246,4 +392,16 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.OutboundTimeStr); }
|
||||
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