Compare commits
6
Commits
61f0fc0edd
...
cb61749cda
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb61749cda | ||
|
|
c1352264a9 | ||
|
|
279ca6e8e9 | ||
|
|
f8af5730d3 | ||
|
|
37d879c3e5 | ||
|
|
fda30c824a |
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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
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="1000"
|
||||||
Background="White"
|
Background="White"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
@@ -50,11 +50,11 @@
|
|||||||
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"
|
||||||
@@ -66,6 +66,7 @@
|
|||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="0.7*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border
|
<Border
|
||||||
@@ -88,6 +89,7 @@
|
|||||||
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"
|
||||||
@@ -105,15 +107,33 @@
|
|||||||
Text="{Binding WxOrderCreateTimeStr}"
|
Text="{Binding WxOrderCreateTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="取号时间:">
|
<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
|
<TextBox
|
||||||
d:Text="26-10-08 00:33:33"
|
d:Text="26-10-08 00:33:33"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding PickUpTimeStr}"
|
Text="{Binding CreateTimeStr}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
<!--<wpf:TitleContent Title="店铺名称:">
|
||||||
|
<TextBox
|
||||||
|
d:Text="芥麦亚"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding ShopName}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>-->
|
||||||
</wpf:SpacingStackPanel>
|
</wpf:SpacingStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<Border
|
<Border
|
||||||
@@ -131,14 +151,17 @@
|
|||||||
Title="{Binding WarehouseName}"
|
Title="{Binding WarehouseName}"
|
||||||
d:Title="上海仓"
|
d:Title="上海仓"
|
||||||
FontWeight="Bold">
|
FontWeight="Bold">
|
||||||
|
<WrapPanel>
|
||||||
<TextBox
|
<TextBox
|
||||||
d:Text="已出仓"
|
d:Text="已出仓"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
FontWeight="Normal"
|
FontWeight="Normal"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding WxOrderId}"
|
Text="{Binding WarehouseStatus}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="入库单号:">
|
<wpf:TitleContent Title="入库单号:">
|
||||||
<TextBox
|
<TextBox
|
||||||
@@ -146,7 +169,7 @@
|
|||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding PickUpTimeStr}"
|
Text="{Binding UpperWaybill}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<wpf:TitleContent Title="出库单号:">
|
<wpf:TitleContent Title="出库单号:">
|
||||||
@@ -155,12 +178,112 @@
|
|||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
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="作废状态:" FontWeight="Bold">
|
||||||
|
<TextBox
|
||||||
|
d:Text="已作废"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Normal"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding TransitVoidStatus}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="拒收状态:" FontWeight="Bold">
|
||||||
|
<TextBox
|
||||||
|
d:Text="拒收失败"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Normal"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding TransitRejectStatus}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
<wpf:TitleContent Title="拦截状态:" FontWeight="Bold">
|
||||||
|
<TextBox
|
||||||
|
d:Text="已拦截"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Normal"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding TransitReturnStatus}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
</wpf:SpacingStackPanel>
|
||||||
|
</Border>
|
||||||
|
<Border
|
||||||
|
Grid.Column="3"
|
||||||
|
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}"
|
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" />
|
TextWrapping="Wrap" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
</wpf:SpacingStackPanel>
|
</wpf:SpacingStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
public partial class TransitAfterSaleWindow : BaseWindow
|
public partial class TransitAfterSaleWindow : BaseWindow
|
||||||
{
|
{
|
||||||
public oms_wei_order_item_info OrderItem { get; set; }
|
public oms_wei_order_item_info OrderItem { get; set; }
|
||||||
|
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
|
||||||
|
|
||||||
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
|
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
|
||||||
{
|
{
|
||||||
@@ -54,9 +55,24 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
|
|
||||||
if (OrderItem != null)
|
if (OrderItem != null)
|
||||||
{
|
{
|
||||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName;
|
if (TransitOrder == null)
|
||||||
this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company ?? OrderItem.ItemTransitOrderWithVoid?.express_2_company;
|
{
|
||||||
this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill ?? OrderItem.ItemTransitOrderWithVoid?.express_2_waybill;
|
if (OrderItem.ItemTransitOrder != null)
|
||||||
|
TransitOrder = OrderItem.ItemTransitOrder;
|
||||||
|
else
|
||||||
|
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
|
||||||
|
}
|
||||||
|
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
|
||||||
|
this.txtExpressName.Text = TransitOrder?.express_2_company;
|
||||||
|
this.txtWarehouseWaybill.Text = TransitOrder?.express_2_waybill;
|
||||||
|
if (this.txtExpressName.Text.IsNullOrEmpty())
|
||||||
|
{
|
||||||
|
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
|
||||||
|
}
|
||||||
|
if (this.txtWarehouseWaybill.Text.IsNullOrEmpty())
|
||||||
|
{
|
||||||
|
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
|
||||||
|
}
|
||||||
|
|
||||||
if (OrderItem.ItemTransitOrderAfterSale != null)
|
if (OrderItem.ItemTransitOrderAfterSale != null)
|
||||||
{
|
{
|
||||||
@@ -73,8 +89,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||||
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||||
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
|
(OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
|
||||||
{
|
{
|
||||||
btnAdd.IsEnabled = false;
|
btnAdd.IsEnabled = false;
|
||||||
imgLoading.Visibility = Visibility.Visible;
|
imgLoading.Visibility = Visibility.Visible;
|
||||||
@@ -89,7 +105,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
btnAdd.IsEnabled = true;
|
btnAdd.IsEnabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
||||||
{
|
{
|
||||||
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
||||||
btnAddressAnalysis_Click(null, null);
|
btnAddressAnalysis_Click(null, null);
|
||||||
@@ -107,8 +123,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
|
//if (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
|
||||||
////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1)
|
|
||||||
//{
|
//{
|
||||||
// btnAdd.IsEnabled = false;
|
// btnAdd.IsEnabled = false;
|
||||||
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||||
@@ -116,7 +131,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
// return;
|
// return;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||||
{
|
{
|
||||||
//btnAdd.IsEnabled = false;
|
//btnAdd.IsEnabled = false;
|
||||||
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
|
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
|
||||||
@@ -151,7 +166,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
|
|
||||||
JObject data = new JObject();
|
JObject data = new JObject();
|
||||||
data["orderNo"] = OrderItem.order_id;
|
data["orderNo"] = OrderItem.order_id;
|
||||||
data["orderCode"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
|
data["orderCode"] = TransitOrder?.order_code;
|
||||||
data["refundProvince"] = txtProvince.Text.Trim();
|
data["refundProvince"] = txtProvince.Text.Trim();
|
||||||
data["refundCity"] = txtCity.Text.Trim();
|
data["refundCity"] = txtCity.Text.Trim();
|
||||||
data["refundCounty"] = txtCounty.Text.Trim();
|
data["refundCounty"] = txtCounty.Text.Trim();
|
||||||
@@ -160,6 +175,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
data["recipientPhone"] = txtMobile.Text.Trim();
|
data["recipientPhone"] = txtMobile.Text.Trim();
|
||||||
data["account_user"] = BaseClass.UserName;
|
data["account_user"] = BaseClass.UserName;
|
||||||
data["accountUser"] = BaseClass.UserName;
|
data["accountUser"] = BaseClass.UserName;
|
||||||
|
if (string.IsNullOrEmpty(TransitOrder.express_1_waybill) && string.IsNullOrEmpty(TransitOrder.express_2_waybill) &&
|
||||||
|
!string.IsNullOrWhiteSpace(txtWarehouseWaybill.Text) && !string.IsNullOrWhiteSpace(txtExpressName.Text.Trim()))
|
||||||
|
{
|
||||||
|
data["refundWaybill"] = txtWarehouseWaybill.Text.Trim();
|
||||||
|
data["returnExpressCompany"] = txtExpressName.Text.Trim();
|
||||||
|
}
|
||||||
//data["platform"] = "WEISHOP";
|
//data["platform"] = "WEISHOP";
|
||||||
|
|
||||||
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
||||||
@@ -249,9 +270,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
|
|
||||||
public string AddWorkOrder()
|
public string AddWorkOrder()
|
||||||
{
|
{
|
||||||
if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
|
if (TransitOrder?.warehouse_status == 3)
|
||||||
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
|
|
||||||
if (OrderItem.ItemTransitOrderWithVoid?.warehouse_status == 3)
|
|
||||||
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
|
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
|
||||||
|
|
||||||
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
|
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
|
||||||
@@ -259,7 +278,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
obj["appId"] = this.OrderItem.Shop?.ShopId;
|
obj["appId"] = this.OrderItem.Shop?.ShopId;
|
||||||
obj["wechatOrderNo"] = this.OrderItem.order_id;
|
obj["wechatOrderNo"] = this.OrderItem.order_id;
|
||||||
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
|
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
|
||||||
obj["purchaseOrderNo"] = OrderItem.ItemTransitOrderWithVoid?.order_code;
|
obj["purchaseOrderNo"] = TransitOrder?.order_code;
|
||||||
obj["creator"] = BaseClass.UserName;
|
obj["creator"] = BaseClass.UserName;
|
||||||
obj["remark"] = "客户要求拦截并退回云仓";
|
obj["remark"] = "客户要求拦截并退回云仓";
|
||||||
|
|
||||||
|
|||||||
@@ -43,6 +43,26 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public class TransitWarehouseData
|
public class TransitWarehouseData
|
||||||
{
|
{
|
||||||
|
public static Dictionary<string, string> dicWarehouseIdName = new Dictionary<string, string>()
|
||||||
|
{
|
||||||
|
{ "XDYBJC", "北京仓" },
|
||||||
|
{ "XDYGZC", "广州仓" },
|
||||||
|
{ "XDYWHC", "武汉2仓" },
|
||||||
|
{ "XDYSHANDC", "山东2仓" },
|
||||||
|
{ "XDYSHC", "上海新仓" },
|
||||||
|
{ "XDYSZC", "深圳仓" },
|
||||||
|
{ "XDYYWC", "义乌仓" },
|
||||||
|
{ "XDYJJC", "晋江仓" },
|
||||||
|
{ "XDYCDC", "成都仓" },
|
||||||
|
{ "XDYCHONGQC", "重庆2仓" },
|
||||||
|
{ "XDYHEBC", "哈尔滨仓" },
|
||||||
|
{ "XDYXA", "西安仓" },
|
||||||
|
{ "XDYGYC", "贵阳仓" },
|
||||||
|
{ "XDYKMC", "昆明仓" },
|
||||||
|
{ "XDYSSC", "河北仓" },
|
||||||
|
{ "XDYZZC", "郑州仓" },
|
||||||
|
};
|
||||||
|
|
||||||
public static string TransitWarehouseDataStr = @"
|
public static string TransitWarehouseDataStr = @"
|
||||||
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
|
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
|
||||||
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
|
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
|
||||||
|
|||||||
@@ -97,5 +97,19 @@ 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; }
|
||||||
|
public DateTime? pickup_time { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架号
|
||||||
|
/// </summary>
|
||||||
|
public string location_code { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架写入时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? location_write_time { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -145,5 +145,29 @@ namespace AllBase.Model.DBModel
|
|||||||
/// 拦截退回操作信息/回调信息
|
/// 拦截退回操作信息/回调信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string intercept_return_info { get; set; }
|
public string intercept_return_info { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 是否手动发货:0自动发货,1手动发货
|
||||||
|
/// </summary>
|
||||||
|
public int is_manual_shipment { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 手动发货处理状态:0未处理,1成功,2失败
|
||||||
|
/// </summary>
|
||||||
|
public int? manual_shipment_status { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架号
|
||||||
|
/// </summary>
|
||||||
|
public string location_code { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架写入时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? location_write_time { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 虚拟快递单号
|
||||||
|
/// </summary>
|
||||||
|
public string virtual_waybill_no { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 虚拟快递公司
|
||||||
|
/// </summary>
|
||||||
|
public string virtual_express_company { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using AllBase.Helper;
|
using AllBase.Helper;
|
||||||
using AllBase.Model.MvvmBaseClasses;
|
using AllBase.Model.MvvmBaseClasses;
|
||||||
|
using NaiBa.Util.Extension;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
@@ -18,7 +19,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,20 +29,42 @@ 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(),
|
||||||
|
.. GetOrderItemTransitExtraList(),
|
||||||
|
];
|
||||||
|
|
||||||
|
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取发货包裹对应信息列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
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()
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
{
|
{
|
||||||
|
oms_wei_order_item_info = OrderItem,
|
||||||
|
oms_wei_external_procurement_log_info = transitOrder,
|
||||||
|
|
||||||
|
ShopName = OrderItem.ItemOrder.shop_name,
|
||||||
|
|
||||||
TransitTypeStr = "发货包裹",
|
TransitTypeStr = "发货包裹",
|
||||||
|
|
||||||
OrderCode = transitOrder.order_code,
|
OrderCode = transitOrder.order_code,
|
||||||
@@ -52,16 +75,26 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
WxOrderThumbImg = OrderItem.thumb_img,
|
WxOrderThumbImg = OrderItem.thumb_img,
|
||||||
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||||
|
|
||||||
|
TransitAddTimeStr = transitOrder.created_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
|
||||||
OutOrderId = transitOrder.out_order_no,
|
OutOrderId = transitOrder.out_order_no,
|
||||||
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
OutBuyerName = transitOrder.OutOrderBuyerStr,
|
||||||
|
|
||||||
UpperWaybill = (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
|
//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('-'),
|
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
||||||
BuyReundStatus = transitOrder.refund_status,
|
BuyRefundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
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,
|
InboundTime = transitOrder.inbound_time,
|
||||||
OutboundTime = transitOrder.outbound_time,
|
OutboundTime = transitOrder.outbound_time,
|
||||||
|
|
||||||
|
WarehouseId = transitOrder.platform,
|
||||||
|
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
|
||||||
|
|
||||||
|
ShelfCodeStr = transitOrder.location_code,
|
||||||
|
ShelfTimeStr = transitOrder.location_write_time == null ? "" : transitOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
||||||
@@ -70,6 +103,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
|
||||||
|
|
||||||
// 中转仓订单创建状态 0 未使用,1 已创建,2 创建失败,3 处理中(业务方根据此字段处理中转流程)
|
// 中转仓订单创建状态 0 未使用,1 已创建,2 创建失败,3 处理中(业务方根据此字段处理中转流程)
|
||||||
|
if (transitOrder.transfer_warehouse_status == 0)
|
||||||
|
transitDetail.TransitStatus = "未使用";
|
||||||
if (transitOrder.transfer_warehouse_status == 1)
|
if (transitOrder.transfer_warehouse_status == 1)
|
||||||
transitDetail.TransitStatus = "已创建";
|
transitDetail.TransitStatus = "已创建";
|
||||||
else if (transitOrder.transfer_warehouse_status == 2)
|
else if (transitOrder.transfer_warehouse_status == 2)
|
||||||
@@ -87,15 +122,276 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
|||||||
else if (transitOrder.warehouse_status == 3)
|
else if (transitOrder.warehouse_status == 3)
|
||||||
transitDetail.WarehouseStatus = "已拦截到仓";
|
transitDetail.WarehouseStatus = "已拦截到仓";
|
||||||
|
|
||||||
transitDetailList.Add(transitDetail);
|
if (transitOrder.order_void_status == 1)
|
||||||
|
transitDetail.TransitVoidStatus = "已作废";
|
||||||
|
//else if (transitOrder.order_void_status == 2)
|
||||||
|
// transitDetail.TransitVoidStatus = "作废失败";
|
||||||
|
|
||||||
|
if (transitOrder?.has_reject == 1)
|
||||||
|
transitDetail.TransitRejectStatus = "已申请拒收";
|
||||||
|
if (transitOrder?.has_reject == 2)
|
||||||
|
transitDetail.TransitRejectStatus = "申请失败";
|
||||||
|
if (transitOrder?.has_reject == 3)
|
||||||
|
transitDetail.TransitRejectStatus = "申请成功";
|
||||||
|
if (transitOrder?.has_reject == 5)
|
||||||
|
transitDetail.TransitRejectStatus = "已取消拒收";
|
||||||
|
if (transitOrder?.has_reject == 99)
|
||||||
|
transitDetail.TransitRejectStatus = "拒收成功";
|
||||||
|
|
||||||
|
var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
|
||||||
|
var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
|
||||||
|
if (transitAfterSaleOrder != null)
|
||||||
|
transitDetail.TransitReturnStatus = "已申请拦截";
|
||||||
|
if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
|
||||||
|
transitDetail.TransitReturnStatus = "拦截成功";
|
||||||
|
else if (transitOrder.intercept_return_status == 2)
|
||||||
|
transitDetail.TransitReturnStatus = "拦截失败";
|
||||||
|
|
||||||
|
detailList.Add(transitDetail);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return detailList;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
|
/// <summary>
|
||||||
|
/// 获取退货包裹对应信息列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
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>();
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
||||||
|
{
|
||||||
|
oms_wei_order_item_info = OrderItem,
|
||||||
|
oms_wei_external_procurement_after_sale_info = transitAftersaleOrder,
|
||||||
|
|
||||||
|
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('-'),
|
||||||
|
BuyRefundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
|
// todo 售后暂时缺少取号时间
|
||||||
|
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 == 0)
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取额外包裹对应信息列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitExtraList()
|
||||||
|
{
|
||||||
|
if (OrderItem == null || OrderItem.ItemOrder == null)
|
||||||
|
{
|
||||||
|
return 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 transitExtraOrder in OrderItem.ItemTransitExtraOrders ?? new List<oms_wei_transfer_extra_package>())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitExtraOrder.order_code);
|
||||||
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
|
{
|
||||||
|
oms_wei_order_item_info = OrderItem,
|
||||||
|
oms_wei_transfer_extra_package = transitExtraOrder,
|
||||||
|
|
||||||
|
ShopName = OrderItem.ItemOrder.shop_name,
|
||||||
|
|
||||||
|
TransitTypeStr = "额外包裹",
|
||||||
|
|
||||||
|
OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
|
||||||
|
SourceCode = transitOrder?.random_code,
|
||||||
|
|
||||||
|
WxOrderId = transitExtraOrder.order_no,
|
||||||
|
WxOrderSkuId = transitOrder?.order_sku_id,
|
||||||
|
WxOrderThumbImg = OrderItem.thumb_img,
|
||||||
|
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||||
|
|
||||||
|
TransitAddTimeStr = transitExtraOrder.created_time == null ? "" : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
|
||||||
|
OutOrderId = transitOrder?.out_order_no,
|
||||||
|
OutBuyerName = transitOrder?.OutOrderBuyerStr,
|
||||||
|
|
||||||
|
UpperWaybill = (transitExtraOrder.logistics_code + "-" + transitExtraOrder.logistics_express_code).Trim('-'),
|
||||||
|
DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'),
|
||||||
|
BuyRefundStatus = transitOrder.refund_status,
|
||||||
|
|
||||||
|
PickUpTime = transitExtraOrder.pickup_time == DateTime.MinValue ? null : transitExtraOrder.pickup_time,
|
||||||
|
CreateTimeStr = transitExtraOrder.created_time == null ? null : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
InboundTime = transitExtraOrder.inbound_time,
|
||||||
|
OutboundTime = transitExtraOrder.outbound_time,
|
||||||
|
|
||||||
|
WarehouseId = transitOrder?.platform,
|
||||||
|
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
|
||||||
|
|
||||||
|
ShelfCodeStr = transitExtraOrder.location_code,
|
||||||
|
ShelfTimeStr = transitExtraOrder.location_write_time == null ? "" : transitExtraOrder.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 创建失败
|
||||||
|
if (transitExtraOrder.transfer_warehouse_status == 0)
|
||||||
|
transitDetail.TransitStatus = "未使用";
|
||||||
|
if (transitExtraOrder.transfer_warehouse_status == 1)
|
||||||
|
transitDetail.TransitStatus = "已创建";
|
||||||
|
else if (transitExtraOrder.transfer_warehouse_status == 2)
|
||||||
|
transitDetail.TransitStatus = "创建失败";
|
||||||
|
else if (transitExtraOrder.transfer_warehouse_status == 3)
|
||||||
|
transitDetail.TransitStatus = "处理中";
|
||||||
|
|
||||||
|
// 额外包裹入库状态 1=入库 2=出库
|
||||||
|
if (transitExtraOrder.warehouse_status == 0)
|
||||||
|
transitDetail.WarehouseStatus = "已创建";
|
||||||
|
else if (transitExtraOrder.warehouse_status == 1)
|
||||||
|
transitDetail.WarehouseStatus = "已入库";
|
||||||
|
else if (transitExtraOrder.warehouse_status == 2)
|
||||||
|
transitDetail.WarehouseStatus = "已出库";
|
||||||
|
else if (transitExtraOrder.warehouse_status == 3)
|
||||||
|
transitDetail.WarehouseStatus = "已拦截到仓";
|
||||||
|
|
||||||
|
// 额外包裹作废状态
|
||||||
|
if (transitExtraOrder.order_void_status == 1)
|
||||||
|
transitDetail.TransitVoidStatus = "已作废";
|
||||||
|
//else if (transitExtraOrder.order_void_status == 2)
|
||||||
|
// transitDetail.TransitVoidStatus = "作废失败";
|
||||||
|
|
||||||
|
if (transitExtraOrder?.has_reject == 1)
|
||||||
|
transitDetail.TransitRejectStatus = "已申请拒收";
|
||||||
|
if (transitExtraOrder?.has_reject == 2)
|
||||||
|
transitDetail.TransitRejectStatus = "申请失败";
|
||||||
|
if (transitExtraOrder?.has_reject == 3)
|
||||||
|
transitDetail.TransitRejectStatus = "申请成功";
|
||||||
|
if (transitExtraOrder?.has_reject == 5)
|
||||||
|
transitDetail.TransitRejectStatus = "已取消拒收";
|
||||||
|
if (transitExtraOrder?.has_reject == 99)
|
||||||
|
transitDetail.TransitRejectStatus = "拒收成功";
|
||||||
|
|
||||||
|
// 额外包裹拦截状态暂时没有,待补充
|
||||||
|
//var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
|
||||||
|
//var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
|
||||||
|
//if (transitAfterSaleOrder != null)
|
||||||
|
// transitDetail.TransitReturnStatus = "已申请拦截";
|
||||||
|
//if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
|
||||||
|
// transitDetail.TransitReturnStatus = "拦截成功";
|
||||||
|
//else if (transitOrder.intercept_return_status == 2)
|
||||||
|
// transitDetail.TransitReturnStatus = "拦截失败";
|
||||||
|
|
||||||
|
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 oms_wei_order_item_info oms_wei_order_item_info { get; set; }
|
||||||
|
public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; }
|
||||||
|
public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; }
|
||||||
|
public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; }
|
||||||
|
|
||||||
|
public string ShopName
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShopName); }
|
||||||
|
set { this.SetValue(x => x.ShopName, value); }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库类型 发货包裹 退货包裹
|
/// 仓库类型 发货包裹 退货包裹
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -116,6 +412,21 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
get { return this.GetValue(x => x.SourceCode); }
|
get { return this.GetValue(x => x.SourceCode); }
|
||||||
set { this.SetValue(x => x.SourceCode, value); }
|
set { this.SetValue(x => x.SourceCode, value); }
|
||||||
}
|
}
|
||||||
|
public string WarehouseId
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.WarehouseId); }
|
||||||
|
set { this.SetValue(x => x.WarehouseId, value); }
|
||||||
|
}
|
||||||
|
public string WarehouseName
|
||||||
|
{
|
||||||
|
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>
|
/// <summary> 取号时间((中转单)创建时间) </summary>
|
||||||
public DateTime? PickUpTime
|
public DateTime? PickUpTime
|
||||||
{
|
{
|
||||||
@@ -150,6 +461,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); }
|
||||||
@@ -184,11 +503,29 @@ 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>
|
/// <summary> 作废状态 </summary>
|
||||||
public string BuyReundStatus
|
public string TransitVoidStatus
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.BuyReundStatus); }
|
get { return this.GetValue(x => x.TransitVoidStatus); }
|
||||||
set { this.SetValue(x => x.BuyReundStatus, value); }
|
set { this.SetValue(x => x.TransitVoidStatus, value); }
|
||||||
|
}
|
||||||
|
/// <summary> 拒收状态 </summary>
|
||||||
|
public string TransitRejectStatus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.TransitRejectStatus); }
|
||||||
|
set { this.SetValue(x => x.TransitRejectStatus, value); }
|
||||||
|
}
|
||||||
|
/// <summary> 拦截退回状态 </summary>
|
||||||
|
public string TransitReturnStatus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.TransitReturnStatus); }
|
||||||
|
set { this.SetValue(x => x.TransitReturnStatus, value); }
|
||||||
|
}
|
||||||
|
/// <summary> 买手退货状态 </summary>
|
||||||
|
public string BuyRefundStatus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.BuyRefundStatus); }
|
||||||
|
set { this.SetValue(x => x.BuyRefundStatus, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string UpperWaybill
|
public string UpperWaybill
|
||||||
@@ -209,7 +546,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
public Visibility DownWaybillVisibility
|
public Visibility DownWaybillVisibility
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.DownWaybillVisibility); }
|
get { return this.GetValue(x => x.DownWaybillVisibility); }
|
||||||
private set { this.SetValue(x => x.DownWaybillVisibility, value); }
|
set { this.SetValue(x => x.DownWaybillVisibility, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public DateTime? InboundTime
|
public DateTime? InboundTime
|
||||||
@@ -220,7 +557,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
public string InboundTimeStr
|
public string InboundTimeStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.InboundTimeStr); }
|
get { return this.GetValue(x => x.InboundTimeStr); }
|
||||||
private set { this.SetValue(x => x.InboundTimeStr, value); }
|
set { this.SetValue(x => x.InboundTimeStr, value); }
|
||||||
}
|
}
|
||||||
public DateTime? OutboundTime
|
public DateTime? OutboundTime
|
||||||
{
|
{
|
||||||
@@ -230,6 +567,18 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
|||||||
public string OutboundTimeStr
|
public string OutboundTimeStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.OutboundTimeStr); }
|
get { return this.GetValue(x => x.OutboundTimeStr); }
|
||||||
private 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); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -48,4 +48,12 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
|||||||
public DateTime? rejected_time { get; set; } // '拒收时间',
|
public DateTime? rejected_time { get; set; } // '拒收时间',
|
||||||
public int? has_reject { get; set; } // DEFAULT NULL,
|
public int? has_reject { get; set; } // DEFAULT NULL,
|
||||||
public DateTime? blocked_arrival_time { get; set; }
|
public DateTime? blocked_arrival_time { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架号
|
||||||
|
/// </summary>
|
||||||
|
public string location_code { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 货架写入时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? location_write_time { get; set; }
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user