优化名称显示
This commit is contained in:
1 parent
79b0027b7e
commit
ee10fb5ea8
3 files changed
+22
-19
No files matched your search
@@ -1701,7 +1701,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
while (orderExist != null)
|
||||
{
|
||||
@@ -1710,31 +1710,34 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(orderExist);
|
||||
orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
});
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
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);
|
||||
|
||||
Reference in new issue
Block a user