diff --git a/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx b/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx deleted file mode 100644 index 89832608..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/12356797-a424-4c2a-adc3-c617dca8137a.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx b/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx deleted file mode 100644 index 433f130a..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/4a7afd6e-e828-444d-9e10-66ab7bbde1e5.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx b/.vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx similarity index 54% rename from .vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx rename to .vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx index d54f94ad..10b7f384 100644 Binary files a/.vs/HighWayIot/FileContentIndex/5a65d8ed-b383-4ab2-9819-ed574ef4f615.vsidx and b/.vs/HighWayIot/FileContentIndex/ddfb4ca8-6bdf-461a-a297-2ed5fa2799eb.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx b/.vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx similarity index 51% rename from .vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx rename to .vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx index eb20c41c..6d9bdcd5 100644 Binary files a/.vs/HighWayIot/FileContentIndex/2e4f607a-da7c-426e-b92d-157f970a532b.vsidx and b/.vs/HighWayIot/FileContentIndex/e692a8dc-b7a0-4d99-9d1c-9467bb6305a8.vsidx differ diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index 03f7ee8a..be030bc3 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -204,15 +204,15 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo { lock (string.Empty) { - #region 通过数据库获取数据进行刷新 - var info = inStoreBusiness.GetInStoreTask(); - if (info != null) + try { - - taskItems = new ObservableCollection(); - try + #region 通过数据库获取数据进行刷新 + var info = inStoreBusiness.GetInStoreTask(); + if (info != null) { - if(info.Count > 0) + + taskItems = new ObservableCollection(); + try { info = info.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1).ToList(); App.Current.Dispatcher.BeginInvoke((Action)(() => @@ -226,13 +226,16 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo InstoreTask = taskItems; })); } + catch (Exception ex) + { + logHelper.Error("入库任务列表刷新异常", ex); + } } - catch (Exception ex) - { - logHelper.Error("入库任务列表刷新异常", ex); - } + #endregion + } catch (Exception ex) + { + logHelper.Error("入库任务加载异常", ex); } - #endregion } }