退货包裹批量展示

This commit is contained in:
wule committed 2026-10-26 15:27:29 +08:00
1 parent 37d879c3e5
commit f8af5730d3
5 files changed
+235 -17

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);
} }
@@ -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"
@@ -105,15 +105,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,6 +149,7 @@
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"
@@ -139,6 +158,16 @@
IsReadOnly="True" IsReadOnly="True"
Text="{Binding WarehouseStatus}" Text="{Binding WarehouseStatus}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBox
d:Text="(已作废)"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitVoidStatus}"
TextWrapping="Wrap" />
</WrapPanel>
</wpf:TitleContent> </wpf:TitleContent>
<wpf:TitleContent Title="入库单号:"> <wpf:TitleContent Title="入库单号:">
<TextBox <TextBox
@@ -158,6 +187,24 @@
Text="{Binding DownWaybill}" Text="{Binding DownWaybill}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</wpf:TitleContent> </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> </wpf:SpacingStackPanel>
</Border> </Border>
<Border <Border
@@ -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,20 +28,34 @@ 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() var transitDetail = new oms_wei_order_item_transit_detail_info()
{ {
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "发货包裹", TransitTypeStr = "发货包裹",
OrderCode = transitOrder.order_code, OrderCode = transitOrder.order_code,
@@ -52,6 +66,8 @@ 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,
@@ -61,11 +77,15 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
BuyReundStatus = transitOrder.refund_status, BuyReundStatus = 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, WarehouseId = transitOrder.platform,
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : 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_"))
@@ -91,15 +111,122 @@ 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 = "(作废失败)";
detailList.Add(transitDetail);
}
catch (Exception ex)
{
}
}
return detailList;
} }
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList); 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()
{
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); }
}
} }