读单相关信息查询全部改为异步调用
This commit is contained in:
1 parent
ee10fb5ea8
commit
761e3f102f
7 files changed
+441
-395
No files matched your search
@@ -130,7 +130,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||
private async void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||
{
|
||||
@@ -199,7 +199,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
@@ -216,13 +216,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败");
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
|
||||
@@ -239,17 +239,17 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = createReturnOrderRst;
|
||||
BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this);
|
||||
this.Close();
|
||||
}
|
||||
|
||||
public static void AddReturnOrder(oms_wei_order_item_info OrderItem)
|
||||
public static async Task AddReturnOrder(oms_wei_order_item_info OrderItem)
|
||||
{
|
||||
// 订单不存在或已作废的,直接返回
|
||||
if (OrderItem == null || OrderItem.ItemRefund == null)
|
||||
@@ -325,7 +325,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
@@ -342,13 +342,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败", "Error", 5);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
|
||||
@@ -364,12 +364,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = createReturnOrderRst;
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
|
||||
|
||||
Reference in new issue
Block a user