diff --git a/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml b/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml index baf0013..8d23e3b 100644 --- a/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml +++ b/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml @@ -172,7 +172,7 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" Foreground="Black" > - + diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/HistorySearchViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/HistorySearchViewModel.cs index 49bb80c..89f0ca4 100644 --- a/SlnMesnac.WPF/ViewModel/IndexPage/HistorySearchViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/IndexPage/HistorySearchViewModel.cs @@ -41,8 +41,8 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage { GetOrderInfoCommand = new RelayCommand(t=> RefreshData(t)); ExportCommand = new RelayCommand(t=> ExportData(t)); - BeginDate = DateTime.Now.Date; // 当天的 0:00:00 - EndDate = DateTime.Now.Date.AddDays(2).AddSeconds(-1); // 当天的 23:59:59 + BeginDate = DateTime.Now.Date.AddDays(-1); // 当天的 0:00:00 + EndDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1); // 当天的 23:59:59 RefreshHistoryData(); } diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs index 58bc1b6..2d01caf 100644 --- a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs @@ -520,7 +520,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage App.Current.Dispatcher.Invoke(() => { - TempRecordList.Add(NowReadData); + TempRecordList.Insert(0, NowReadData); PreparedWriteList[no - 1].writestatus = "已写入"; });