Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -110,7 +110,8 @@ namespace BBWY.Client.Models
                 if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())//B端有采购方案
                 {
                     UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this, ReflashTask);
-                    updatePurchaseWindow.ShowDialog();
+                    if (!updatePurchaseWindow.IsClosed)
+                        updatePurchaseWindow.ShowDialog();
                     return;
                 }
 
@@ -167,7 +168,7 @@ namespace BBWY.Client.Models
         private void PackagingTaskException(long taskId)
         {
 
-             var wareVm =   (App.Current as App).ServiceProvider.GetRequiredService<WareHouseListViewModel>();
+            var wareVm = (App.Current as App).ServiceProvider.GetRequiredService<WareHouseListViewModel>();
             AddExceptionWindow addExceptionWindow = new AddExceptionWindow(packTaskAbortService, taskId, Models.TaskState.待包装, ReflashTask, wareVm.IsCanPackModelList, wareVm.ShelvesNumberList, wareVm.FloorNumberList);
             addExceptionWindow.ShowDialog();
         }

BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@@ -503,6 +503,10 @@ namespace BBWY.Client.ViewModels.PackTask
             {
                 if (skuResponse.Data.Count() == 0)
                 {
+
+
+                    MessageBox.Show("查询不到品牌数据，请检查该SKU是否下架！");
+
                     return false;
                 }
                 Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");