From 58dcd8480e09de5f8c9cf33564a1519d376715b1 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Mon, 27 Nov 2023 15:00:19 +0800 Subject: [PATCH] 1 --- BBWY.Client/Models/PackTask/PackTaskModel.cs | 5 +++-- .../ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 35c26940..98723660 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/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(); + var wareVm = (App.Current as App).ServiceProvider.GetRequiredService(); AddExceptionWindow addExceptionWindow = new AddExceptionWindow(packTaskAbortService, taskId, Models.TaskState.待包装, ReflashTask, wareVm.IsCanPackModelList, wareVm.ShelvesNumberList, wareVm.FloorNumberList); addExceptionWindow.ShowDialog(); } diff --git a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs index cba17e72..5dac3706 100644 --- a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs +++ b/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");