diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs index cacb446..95372a8 100644 --- a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs @@ -32,6 +32,11 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs public string? workTime { get; set; } public long? workInt { get; set; } + + /// + /// 记录编辑时第一次带入的设备名称 + /// + public string Device { get; set; } /// /// 开始时间 @@ -333,6 +338,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs SensorID = su.SensorID; WorkTime = su.WorkTime; DurationTime = su.DurationTime; + Device = SensorID; } DeviceNodes = _deviceSvice.GetDevices().ToList(); @@ -364,19 +370,29 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs return; } - + //编辑情况下 if (Number != 0) { - //编辑情况下 - - + if (Device != SensorID) + { + //传感器是否已存在校验 + var selectFirst = _sequentialService.Query(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList(); + if (selectFirst.Count != 0) + { + System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示"); + return; + } + } } - //传感器是否已存在校验 - var select = _sequentialService.Query(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList(); - if (select.Count != 0) + else { - System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示"); - return; + //传感器是否已存在校验 + var select = _sequentialService.Query(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList(); + if (select.Count != 0) + { + System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示"); + return; + } } ///工作时长是否已超过传感器预设时间 diff --git a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs index 6fc08bc..8fa0a32 100644 --- a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs @@ -281,6 +281,8 @@ namespace InSituLaboratory.ViewModels.Pages sysSequentialDetail.Number = item.Number; sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.SensorID = item.SensorID; + sysSequentialDetail.WorkTime = item.WorkTime; + sysSequentialDetail.SequenceGroup = item.SequenceGroup; sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.SysSquentialID = item.SysSquentialID; @@ -399,6 +401,8 @@ namespace InSituLaboratory.ViewModels.Pages sysSequentialDetail.Number = item.Number; sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.SensorID = item.SensorID; + sysSequentialDetail.WorkTime = item.WorkTime; + sysSequentialDetail.SequenceGroup = item.SequenceGroup; sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.SysSquentialID = item.SysSquentialID; @@ -517,6 +521,8 @@ namespace InSituLaboratory.ViewModels.Pages sysSequentialDetail.Number = item.Number; sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.SensorID = item.SensorID; + sysSequentialDetail.WorkTime = item.WorkTime; + sysSequentialDetail.SequenceGroup = item.SequenceGroup; sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.SysSquentialID = item.SysSquentialID; @@ -635,6 +641,8 @@ namespace InSituLaboratory.ViewModels.Pages sysSequentialDetail.Number = item.Number; sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.SensorID = item.SensorID; + sysSequentialDetail.WorkTime = item.WorkTime; + sysSequentialDetail.SequenceGroup = item.SequenceGroup; sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.SysSquentialID = item.SysSquentialID; diff --git a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml index a33cdaa..639ab44 100644 --- a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml +++ b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml @@ -171,7 +171,7 @@ 删除 + CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除 @@ -235,11 +235,15 @@ + + - - - + + + + + @@ -271,20 +275,25 @@ + + - - + + + + + - + - 编辑 + 编辑 - 删除 + 删除 @@ -347,11 +356,15 @@ + + - - - + + + + + @@ -383,20 +396,24 @@ + + - - + + + + - + - 编辑 + 编辑 - 删除 + 删除 @@ -459,11 +476,15 @@ + + - - - + + + + + @@ -495,20 +516,25 @@ + + - - + + + + + - + - 编辑 + 编辑 - 删除 + 删除 @@ -571,11 +597,15 @@ + + - - - + + + + + @@ -607,20 +637,24 @@ + + - - + + + + - + - 编辑 + 编辑 - 删除 + 删除 @@ -631,7 +665,6 @@ -