优化买手单读取
This commit is contained in:
1 parent
7380763c1d
commit
fd07c9ba40
8 files changed
+4383
-129
No files matched your search
@@ -1650,11 +1650,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (token.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
|
||||
var orders = GlobalConfig.lstFilterOrder.ToList();
|
||||
if (!orders.Any(o => o.order_id == order.order_id))
|
||||
{
|
||||
Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1676,7 +1680,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (order == null)
|
||||
return;
|
||||
|
||||
var orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
oms_wei_order_info orderExist = null;
|
||||
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
while (orderExist != null)
|
||||
{
|
||||
Dispatcher.Invoke(() =>
|
||||
@@ -1688,26 +1697,31 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (!GetOrderIsFilter(order))
|
||||
{
|
||||
oms_wei_order_info nextOrder = null;
|
||||
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);
|
||||
|
||||
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);
|
||||
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
|
||||
Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
}
|
||||
});
|
||||
Thread.Sleep(1);
|
||||
|
||||
Reference in new issue
Block a user