From 7e722c9127770ec856331dd6243dda8d3b0cd0b8 Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 6 Nov 2023 17:10:01 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=88=9D=E5=A7=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/StatisticsPageViewModel.cs | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs index 0a798077..d4b531d2 100644 --- a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs +++ b/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs @@ -23,9 +23,7 @@ namespace Aucma.Core.CodeBinding.ViewModels private readonly ICodeBindingRecordServices? _codeBindingRecordServices; public StatisticsPageViewModel() { _codeBindingRecordServices = App.ServiceProvider.GetService(); - LoadData(); - log.Info($"启动123"); - log.Error($"StatisticsPageViewModel:启动123"); + LoadData(); } List materialComplateInfos = new List(); @@ -33,22 +31,36 @@ namespace Aucma.Core.CodeBinding.ViewModels #region 加载DataGrid数据 private async void LoadData() { - ListItems.Add(new ReaderInfo() { No = 1, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + + List records = null; + records = await _codeBindingRecordServices.QueryAsync(x => x.BoxCode != null, "RECORD_TIME1 desc"); + if (records != null) + { + foreach (CodeBindingRecord record in records) + { + Application.Current.Dispatcher.Invoke(() => + { + ListItems.Add(new ReaderInfo() { No = record.ObjId, BoxCode = record.BoxCode, ProductCode = record.ProductCode, BindingResult = record.BindingResult, RecordTime = record.RecordTime1.ToString() }); + }); + + } + } + add(); } private async void add() { - await Task.Delay(5000); - ListItems.Add(new ReaderInfo() { No = 2, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 3, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 4, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 5, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 6, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 7, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 8, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); ListItems.Add(new ReaderInfo() { No = 1, BoxCode = "42423444", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 9, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); - ListItems.Add(new ReaderInfo() { No = 10, BoxCode = "42423444",BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //await Task.Delay(5000); + //ListItems.Add(new ReaderInfo() { No = 2, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 3, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 4, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 5, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 6, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 7, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 8, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); ListItems.Add(new ReaderInfo() { No = 1, BoxCode = "42423444", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 9, BoxCode = "42423444", BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); + //ListItems.Add(new ReaderInfo() { No = 10, BoxCode = "42423444",BoxName = "SC-箱体11111", ProductCode = "8659452123", BindingResult = "成功", RecordTime = System.DateTime.Now.ToString() }); } #endregion