From 22d379575051dc19d9ac043fec485a49f9a43ea0 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 8 Dec 2023 15:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=B0=81=E7=AE=B1=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E6=97=B6=E5=80=99=E6=8B=89=E5=8F=96=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E5=B0=81=E7=AE=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/BBWYAppSettings.json | 4 ++-- .../PackTask/WareHouseListViewModel.cs | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index 197f2c55..54bc506c 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - //"QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + // "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 17938dc4..8efb5100 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -39,6 +39,7 @@ using BBWY.Client.Extensions; using BBWY.Client.Views.PackTaskAbort; using System.Windows.Controls; using BBWY.Client.Views.SomeArrival; +using BBWY.Client.Views.PackTask; namespace BBWY.Client.ViewModels.PackTask { @@ -1135,7 +1136,7 @@ namespace BBWY.Client.ViewModels.PackTask { - if (IsPassInspection||model.TaskAbortTime != null)//验收过 跳过询问 + if (IsPassInspection || model.TaskAbortTime != null)//验收过 跳过询问 { isqualityCer = true; return; @@ -1563,6 +1564,21 @@ namespace BBWY.Client.ViewModels.PackTask { var model = (SealBoxModel)obj; + var datas = sealBoxService.GetWareSealBoxList(null, null, null, model.SealBoxId, 1, 10); + if (datas != null && datas.Data != null && datas.Success) + { + var dataModel = datas.Data; + + + var flashModel = dataModel.WaitSealBoxModels.SingleOrDefault(w => w.SealBoxId == model.SealBoxId); + + if (flashModel != null) + { + model.SealBoxSkus = flashModel.SealBoxSkus; + } + + + } SealBoxPrintDetailsWindow printDetailsWindow = new SealBoxPrintDetailsWindow(model, sealBoxService); printDetailsWindow.ShowDialog(); }