过滤订单使用异步方法 优化中转仓额外包裹逻辑

This commit is contained in:
wule committed 2026-11-10 16:34:57 +08:00
1 parent 200e5bc8c8
commit 344cbb4ac2
4 files changed
+33 -25

No files matched your search

@@ -1686,13 +1686,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
});
}
public void FilterOneOrder(string orderId, bool updateTabCount = false)
public async Task FilterOneOrder(string orderId, bool updateTabCount = false)
{
var orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == orderId);
FilterOneOrder(orderExist, updateTabCount);
await FilterOneOrder(orderExist, updateTabCount);
}
public void FilterOneOrder(oms_wei_order_info order, bool updateTabCount = false)
public async Task FilterOneOrder(oms_wei_order_info order, bool updateTabCount = false)
{
if (order == null)
return;
@@ -1717,23 +1717,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!GetOrderIsFilter(order))
{
var index = -1;
oms_wei_order_info nextOrder = null;
lock (MainWindow._orderLock)
{
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.update_time < order.update_time);
else
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
}
if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
Dispatcher.InvokeAsync(() =>
await Dispatcher.InvokeAsync(() =>
{
lock (MainWindow._orderLock)
{
var index = -1;
oms_wei_order_info nextOrder = null;
//lock (MainWindow._orderLock)
{
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.update_time < order.update_time);
else
nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.create_time < order.create_time);
}
if (nextOrder != null)
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
{
GlobalConfig.lstFilterOrder.Insert(index, order);
@@ -1749,7 +1750,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (updateTabCount)
{
disPlayOrderTabOrderCount();
await disPlayOrderTabOrderCount();
}
}