From 8d4c72a2bc32831d10520d20ed70b64eef462a77 Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Fri, 15 Dec 2023 14:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                        |  2 +-
 .../Purchase/1688PreviewPurchaseViewModel.cs        | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index aa9ede9e..5831bf75 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10221";
+            ClientVersion = "10222";
         }
 
 
diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
index f9022b7d..878d5aea 100644
--- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
+++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
@@ -76,6 +76,7 @@ namespace BBWY.Client.ViewModels
         /// 扩展数据，暂用于拳探
         /// </summary>
         private string extensions;
+        private bool isSkuMatchError;
 
         public _1688PreviewPurchaseViewModel(OneBoundAPIService oneBoundAPIService,
                                              PurchaseService purchaseService,
@@ -117,7 +118,7 @@ namespace BBWY.Client.ViewModels
         protected override void Load()
         {
             IsLoading = true;
-
+            isSkuMatchError = false;
             Task.Factory.StartNew(() => purchaseService.GetPurchaseSchemeList(order.ItemList.Select(osku => osku.Id).ToList(), purchaser.Id, globalContext.User.Shop.ShopId))
                         .ContinueWith(r =>
                         {
@@ -150,7 +151,10 @@ namespace BBWY.Client.ViewModels
                             else
                             {
                                 IsLoading = false;
-                                App.Current.Dispatcher.Invoke(() => MessageBox.Show("采购方案商品加载失败,请重新打开预览窗口", "提示"));
+                                if (isSkuMatchError)
+                                    App.Current.Dispatcher.Invoke(() => MessageBox.Show("采购方案与当前商品页的数据匹配失败，请删除旧采购方案后重新绑定采购方案", "提示"));
+                                else
+                                    App.Current.Dispatcher.Invoke(() => MessageBox.Show("采购方案商品加载失败,请重新打开预览窗口", "提示"));
                             }
                         });
         }
@@ -195,6 +199,11 @@ namespace BBWY.Client.ViewModels
                         }
                     }
                 });
+
+                if (purchaseSchemeProduct.SelectedSkuIdList.Any(s => !data.Value.purchaseSchemeProductSkus.Any(s1 => s1.PurchaseSkuId == s)))
+                {
+                    isSkuMatchError = true;
+                }
             }
 
             ewh.Set();