Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
3affb4a732
9 files changed
+4384
-130
No files matched your search
@@ -58,6 +58,7 @@ namespace _29WxOrderWpf
|
||||
public partial class MainWindow : BaseWindow, INotifyPropertyChanged
|
||||
{
|
||||
public static MainWindow Instance { get; private set; }
|
||||
public static readonly object _orderLock = new object();
|
||||
|
||||
private readonly TicketRealtimeMonitor _ticketMonitor = TicketRealtimeMonitor.Current;
|
||||
private readonly WorkOrderUnreadService _workOrderUnreadService = new WorkOrderUnreadService();
|
||||
@@ -338,7 +339,12 @@ namespace _29WxOrderWpf
|
||||
break;
|
||||
}
|
||||
|
||||
foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
|
||||
List<oms_wei_order_info> orders;
|
||||
lock (_orderLock)
|
||||
{
|
||||
orders = GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList();
|
||||
}
|
||||
foreach (var order in orders)
|
||||
{
|
||||
// 更新代发管理情况
|
||||
foreach (var orderItem in order.orderItems)
|
||||
|
||||
Reference in new issue
Block a user