diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index b467239..991a67c 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -1718,7 +1718,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { GlobalConfig.lstFilterOrder.Remove(orderExist); }); - orderExist = GlobalConfig.lstFilterOrder.ToList().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)) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index bc08fb3..bfb97d8 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1334,7 +1334,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else { rejectStatus = 2; - var err = BaseRegex.GetStringXmlByRegs(ref html, "msg"); + var err = BaseRegex.GetStringXmlByRegs(ref html, html, "msg"); //BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3); throw new Exception("申请失败" + err); } diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml index bf64e31..2d0e460 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml @@ -306,7 +306,7 @@ - 云仓拒收退回总店 + 云仓拒收退回总店