From cd4b11d01da0833bd57c23604afab7e49c91ae23 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sat, 16 Nov 2024 16:59:20 +0800 Subject: [PATCH] =?UTF-8?q?add-=E6=B7=BB=E5=8A=A0=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E6=9C=BA=E7=9B=B8=E5=85=B3=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8F=8AWPF=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/DmsRecordAlarmInfo.cs | 2 +- src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 6 +- src/Khd.Core.Wpf/Form/FormBoardT.xaml | 1 + src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 6 + .../WindowPage/HoistWarnInfoWindow.xaml | 243 ++++++++++++++++++ .../WindowPage/HoistWarnInfoWindow.xaml.cs | 111 ++++++++ 6 files changed, 365 insertions(+), 4 deletions(-) create mode 100644 src/Khd.Core.Wpf/WindowPage/HoistWarnInfoWindow.xaml create mode 100644 src/Khd.Core.Wpf/WindowPage/HoistWarnInfoWindow.xaml.cs diff --git a/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs b/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs index fb67b7d..5f231c5 100644 --- a/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs +++ b/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs @@ -6,7 +6,7 @@ namespace Khd.Core.Domain.Models { [Table("dms_record_alarm_info")] public class DmsRecordAlarmInfo - { + { [Key] [Column("alarm_id")] public long AlarmId { get; set; } diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs index e1c8799..3dd9d1b 100644 --- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs +++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs @@ -426,8 +426,8 @@ namespace Khd.Core.Wcs.Wcs } else { - //TODO 物料未绑定仓库，添加报警 - SystemData.InsertWaringLog(dbContext, WaringType.绑定物料无仓库信息); + + SystemData.InsertWaringLog(dbContext, WaringType.绑定物料无仓库信息, "一楼接驳位物料未绑定仓库信息"); continue; } } @@ -840,7 +840,7 @@ namespace Khd.Core.Wcs.Wcs } else { - SystemData.InsertWaringLog(dbContext, WaringType.提升机任务下发异常, ex.Message); + SystemData.InsertWaringLog(dbContext, WaringType.提升机任务下发异常, "提升机任务下发异常"+ex.Message); _logger.Error(ex.Message + "\n" + ex.StackTrace); } } diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index 37011ae..6b568f3 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -3377,6 +3377,7 @@ IsReadOnly="True"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Khd.Core.Wpf/WindowPage/HoistWarnInfoWindow.xaml.cs b/src/Khd.Core.Wpf/WindowPage/HoistWarnInfoWindow.xaml.cs new file mode 100644 index 0000000..651ae0d --- /dev/null +++ b/src/Khd.Core.Wpf/WindowPage/HoistWarnInfoWindow.xaml.cs @@ -0,0 +1,111 @@ +using Khd.Core.Domain.Models; +using Khd.Core.EntityFramework; +using Khd.Core.Library.Mapper; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Khd.Core.Wpf.WindowPage +{ + /// + /// HoistWarnInfoWindow.xaml 的交互逻辑 + /// + public partial class HoistWarnInfoWindow : Window + { + private IHost _host; + public HoistWarnInfoWindow(IHost host) + { + _host = host; + InitializeComponent(); + Task.Run(async () => + { + await InitList(); + }); + } + + /// + /// 显示序号事件 + /// + /// + /// + private void dgData_LoadingRow(object sender, DataGridRowEventArgs e) + { + e.Row.Header = e.Row.GetIndex() + 1; + } + + + /// + /// 初始加载500条数据 + /// + /// + /// + /// + private async Task InitList() + { + try + { + using var scope = _host.Services.CreateScope(); + using var dbContext = scope.ServiceProvider.GetRequiredService(); + List list = await dbContext.DmsRecordAlarmInfo.Where(x => x.DeviceId == 6 ).OrderByDescending(x => x.CreateTime).Take(500).ToListAsync(); + Dispatcher.Invoke(() => + { + this.LoadMaterial0.ItemsSource = null; + this.LoadMaterial0.ItemsSource = list; + this.LoadMaterial0.Items.Refresh(); + }); + } + catch (Exception ex) + { + MessageBox.Show($"查询报警出现异常,请重新尝试:{ex.Message}"); + } + } + + + + private async Task GetHistory(DateTime startTime, DateTime endTime) + { + try + { + using var scope = _host.Services.CreateScope(); + using var dbContext = scope.ServiceProvider.GetRequiredService(); + List< DmsRecordAlarmInfo > list = await dbContext.DmsRecordAlarmInfo.Where(x => x.DeviceId ==6 && x.CreateTime>= startTime && x.CreateTime <= endTime).OrderByDescending(x => x.CreateTime).ToListAsync(); + Dispatcher.Invoke(() => + { + this.LoadMaterial0.ItemsSource = null; + this.LoadMaterial0.ItemsSource = list; + this.LoadMaterial0.Items.Refresh(); + }); + } + catch (Exception ex) + { + MessageBox.Show($"查询报警出现异常,请重新尝试:{ex.Message}"); + } + } + + private async void SelectByTime_Click(object sender, RoutedEventArgs e) + { + DateTime? begin = this.BeginTime.SelectedDate; + DateTime? end = this.EndTime.SelectedDate; + if (begin == null || end == null) + { + MessageBox.Show($"请选择开始或者结束时间"); + return; + } + await GetHistory(begin.Value, end.Value); + + } + + } +}