From a64d7a5273a1bf95dace4b19508fa31ebe5c25f8 Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 22 Apr 2024 18:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v17/.suo | Bin 828928 -> 840704 bytes ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 51632 -> 51632 bytes .../AssemblyPlan/AssemblyPlanViewModel.cs | 9 ++++----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 181429d970bc9e900bd5a2eb8b6224872863a8b5..4ba23c865b65108147f6831ce99c306f89588cea 100644 GIT binary patch delta 20027 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 delta 11056 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 diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 35f826b9848670630bb08af6b97794cac8964859..259cbe9406315dd342ca5eeaba944b4341c9fd4d 100644 GIT binary patch delta 28 kcmdlmnR&xx<_SeS2Bu7(qZ00LFfuZVO#C3Sagy9g0G0R(X#fBK delta 28 kcmdlmnR&xx<_SeSzZR~uuZq9J!N|xcGVz1R#z}G~0j`V-wg3PC diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 4bd9423f..069a91ba 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -509,11 +509,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan { await Task.Run(() => { - if (listTime == null) - { - listTime = _baseBomInfoServices.getWorkTime().Result; - if (listTime == null) return; - } + + listTime = _baseBomInfoServices.getWorkTime().Result; + if (listTime == null) return; + //获取小时产量 List hourAmount = assemblyPlanBusiness.GetHourAmount(); if (hourAmount != null)