读单相关信息查询全部改为异步调用
This commit is contained in:
1 parent
ee10fb5ea8
commit
761e3f102f
7 files changed
+441
-395
No files matched your search
@@ -438,7 +438,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
List<oms_wei_order_info> GetOrderInfo(string order_ids)
|
||||
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_order_info>();
|
||||
@@ -463,7 +463,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (orders == null)
|
||||
orders = new List<oms_wei_order_info>();
|
||||
|
||||
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
|
||||
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
|
||||
foreach (var orderItem in orderItems)
|
||||
{
|
||||
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn));
|
||||
|
||||
// 装载同步单
|
||||
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos);
|
||||
var syncOrderList = await OrderListCtrl.GetSyncLogistics(out_order_nos);
|
||||
foreach (var syncOrder in syncOrderList)
|
||||
{
|
||||
if (!lstSyncLogistics.Contains(syncOrder))
|
||||
@@ -754,7 +754,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
var order_ids = string.Join(",", order_id_lst.Distinct());
|
||||
var orders = GetOrderInfo(order_ids);
|
||||
var orders = await GetOrderInfo(order_ids);
|
||||
|
||||
//var buyerAfterSales = GetOrderAfterSales(order_ids);
|
||||
|
||||
@@ -1103,7 +1103,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
var order_ids = string.Join(",", order_id_lst.Distinct());
|
||||
|
||||
var orders = GetOrderInfo(order_ids);
|
||||
var orders = await GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
@@ -1667,13 +1667,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder)
|
||||
{
|
||||
btn.IsEnabled = false;
|
||||
Task.Run(() =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
var out_order_nos = buyerOrder.order_sn;
|
||||
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
|
||||
|
||||
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
|
||||
var orders = GetOrderInfo(order_ids);
|
||||
var orders = await GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
@@ -2011,7 +2011,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPickUpNo(TbPickInfo tbPickInfo)
|
||||
public async Task SetPickUpNo(TbPickInfo tbPickInfo)
|
||||
{
|
||||
List<combine_track_info> orderSnTracks = new List<combine_track_info>();
|
||||
foreach (var combine in tbPickInfo.combine_list)
|
||||
@@ -2027,7 +2027,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
return;
|
||||
|
||||
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
|
||||
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
var syncOrderList = await OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
foreach (var sOrder in syncOrderList)
|
||||
{
|
||||
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
|
||||
@@ -2108,7 +2108,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
}
|
||||
|
||||
public void SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
|
||||
public async Task SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -2119,7 +2119,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
// 取最新订单状态
|
||||
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
|
||||
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
|
||||
if (wxOrder == null)
|
||||
throw new Exception("买手单对应微信订单不存在!");
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
|
||||
|
||||
Reference in new issue
Block a user