diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 181429d9..4ba23c86 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ 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 35f826b9..259cbe94 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ 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)