1优化拍单逻辑 2优化部分文件位置命名等
This commit is contained in:
1 parent
34c51c6fcd
commit
1e27c0b1e1
65 files changed
+2594
-268
No files matched your search
@@ -4,7 +4,7 @@ using AllBase;
|
||||
using AllBase.Extension;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model;
|
||||
using AllBase.Model.Result;
|
||||
using AllBase.Model.Local;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -224,6 +224,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
order.order_items.Add(item);
|
||||
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
}
|
||||
@@ -275,7 +277,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
imgLoading.Visibility = Visibility.Hidden;
|
||||
btnSearch.IsEnabled = true;
|
||||
}));
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user