增量读取订单功能 90% 新的二级oem 50%
This commit is contained in:
1 parent
e3f4e34def
commit
171064f03f
31 files changed
+1169
-624
No files matched your search
@@ -349,7 +349,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("请选择买手号");
|
||||
return;
|
||||
}
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
{
|
||||
if (!isAutoBuy)
|
||||
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
|
||||
@@ -357,7 +357,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
var oldVisibility = orderItem.BtnAbnormalOrderRebuyVisibility;
|
||||
if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.orderItems
|
||||
if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.OrderItems
|
||||
.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
|
||||
{
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
@@ -374,10 +374,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var skuId = orderItem.sku_id;
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
if (newOrder.OrderItems.Count == 1)
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
return;
|
||||
if (isAbnormalOrder)
|
||||
@@ -515,7 +515,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == orderItem.ItemOrder?.Shop?.ErpShopId).ToList())
|
||||
{
|
||||
// 更新代发管理情况
|
||||
foreach (var oi in ord.orderItems)
|
||||
foreach (var oi in ord.OrderItems)
|
||||
MainWindow.Instance.Dispatcher.Invoke(new Action(() => { oi.UpdateOrderItemBuyButton(); }));
|
||||
}
|
||||
BaseMsgWindow.ShowError("请登录店铺");
|
||||
@@ -1302,7 +1302,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("请选择买手号");
|
||||
return;
|
||||
}
|
||||
if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
{
|
||||
//BaseMsgWindow.ShowError("多子单或多件商品订单中转仓暂不支持");
|
||||
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
|
||||
@@ -1323,10 +1323,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var skuId = orderItem.sku_id;
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
if (newOrder?.OrderItems.Count == 1)
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
return;
|
||||
orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility;
|
||||
|
||||
Reference in new issue
Block a user