diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 991a67c..d15cb54 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -296,7 +296,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls public void AutoGetOrder() { - Task.Run(() => + Task.Run(async () => { //Thread.Sleep(5000); while (true) @@ -318,7 +318,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { btnSearch.Content = "读单"; })); - GetOrder(); + await GetOrder(); nextGetOrderTime = DateTime.Now.AddMinutes(25); } Thread.Sleep(1000); @@ -554,7 +554,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id)); // 中转仓退货包裹订单 - if (item.order_id == "3740040052771291904") + if (item.order_id == "3740137835668615168") { } @@ -575,6 +575,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 装载订单售后详情 order.refundItems = new ObservableCollection(refunds.Where(of => of.order_id == order.order_id)); + if (order.order_id.Contains("3740137835668615168")) + { + var x = order.orderItems.FirstOrDefault(); + } + // 装载同步单 order.SyncLogisticsList = [.. syncLogistics.Where(os => order.orderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),]; if (order.SyncLogisticsList.Count > 0) @@ -582,12 +587,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } - - if (order.order_id.Contains("3738794693820307200")) - { - - } - // 装载订单物流最后一条信息 order.latestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())]; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index bfb97d8..67a2c88 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1252,7 +1252,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { try { - BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, orderItem.ItemTransitOrder)); + var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid; + BaseMsgWindow.ShowInfo(await RejectTransitOrder(orderItem, transitOrder)); } catch (Exception ex) { @@ -1304,7 +1305,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls orderItem.PddBuyerOrders.AddRange(OrderListCtrl.GetTbBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList()); OrderListCtrl.InitOrderItemObservableProp(orderItem); - var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder.order_code && o.out_order_no == _itemTransitOrder.out_order_no); + var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no); if (itemTransitOrder == null) itemTransitOrder = _itemTransitOrder; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml.cs index 5a7d45a..7a02c89 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListCtrl.xaml.cs @@ -27,6 +27,11 @@ public partial class OrderTransitListCtrl : UserControl { InitializeComponent(); + UpdateViewModel(transitInfo); + } + + public void UpdateViewModel(oms_wei_order_item_transit_info transitInfo) + { ViewModel = new OrderTransitListCtrlViewModel(transitInfo); ViewModel.RequestClose += ViewModel_RequestClose; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml index 2d0e460..060b3ee 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml @@ -292,6 +292,19 @@ VerticalAlignment="Center" Orientation="Vertical" VerticalSpacing="5"> +