diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index b3ad8edc..c63fb25d 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10215"; + ClientVersion = "10216"; } diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index fef1fb33..d3aec609 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -182,12 +182,15 @@ namespace BBWY.Client.ViewModels { foreach (var purchaseSchemeProductSku in data.Value.purchaseSchemeProductSkus) { - purchaseSchemeProductSku.SkuPurchaseSchemeId = purchaseSchemeProduct.SkuPurchaseSchemeId; - if (purchaseSchemeProduct.SelectedSkuIdList.Any(s => s == purchaseSchemeProductSku.PurchaseSkuId)) + if (orderSku != null && purchaseSchemeProductSku.SkuId == orderSku.Id) { - PurchaseSchemeProductSkuList.Add(purchaseSchemeProductSku); - purchaseSchemeProductSku.ItemTotal = orderSku.ItemTotal; - purchaseSchemeProductSku.OnItemTotalChanged = OnItemTotalChanged; + purchaseSchemeProductSku.SkuPurchaseSchemeId = purchaseSchemeProduct.SkuPurchaseSchemeId; + if (purchaseSchemeProduct.SelectedSkuIdList.Any(s => s == purchaseSchemeProductSku.PurchaseSkuId)) + { + PurchaseSchemeProductSkuList.Add(purchaseSchemeProductSku); + purchaseSchemeProductSku.ItemTotal = orderSku.ItemTotal; + purchaseSchemeProductSku.OnItemTotalChanged = OnItemTotalChanged; + } } } }); @@ -224,6 +227,24 @@ namespace BBWY.Client.ViewModels return; } + #region 由于未知原因,会存在不属于当前订单的配件sku,预览时清理一次 + for (var i = 0; i < PurchaseSchemeProductSkuList.Count(); i++) + { + var pss = PurchaseSchemeProductSkuList[i]; + if (!order.ItemList.Any(osku => osku.Id == pss.SkuId)) + { + //这个采购配件不属于这笔订单 + PurchaseSchemeProductSkuList.RemoveAt(i); + i--; + } + } + if (PurchaseSchemeProductSkuList.Count() == 0) + { + MessageBox.Show("采购配件数量为0"); + return; + } + #endregion + IsLoading = true; Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee() {