Zhou/20230201_145_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决单个时序保存存在同种传感器校验不通过的问题

Browse Source
This commit is contained in:
MoYue 2024-04-13 11:38:55 +08:00
parent 3efb369221
commit 7dbb24ceb9
3 changed files with 108 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
View File

@ -33,6 +33,11 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
public long? workInt { get; set; } public long? workInt { get; set; }
/// <summary>
/// 记录编辑时第一次带入的设备名称
/// </summary>
public string Device { get; set; }
/// <summary> /// <summary>
/// 开始时间 /// 开始时间
/// </summary> /// </summary>
@ -333,6 +338,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
SensorID = su.SensorID; SensorID = su.SensorID;
WorkTime = su.WorkTime; WorkTime = su.WorkTime;
DurationTime = su.DurationTime; DurationTime = su.DurationTime;
Device = SensorID;
} }
DeviceNodes = _deviceSvice.GetDevices().ToList(); DeviceNodes = _deviceSvice.GetDevices().ToList();
@ -364,13 +370,22 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
return; return;
} }
//编辑情况下
if (Number != 0) if (Number != 0)
{ {
//编辑情况下 if (Device != SensorID)
{
//传感器是否已存在校验
var selectFirst = _sequentialService.Query<SysSequentialDetails>(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;
} }
}
}
else
{
//传感器是否已存在校验 //传感器是否已存在校验
var select = _sequentialService.Query<SysSequentialDetails>(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList(); var select = _sequentialService.Query<SysSequentialDetails>(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList();
if (select.Count != 0) if (select.Count != 0)
@ -378,6 +393,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示"); System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示");
return; return;
} }
}
///工作时长是否已超过传感器预设时间 ///工作时长是否已超过传感器预设时间
workTime = _deviceSvice.GetDeviceByDeviceName(SensorID); workTime = _deviceSvice.GetDeviceByDeviceName(SensorID);

8
InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs
View File

@ -281,6 +281,8 @@ namespace InSituLaboratory.ViewModels.Pages
sysSequentialDetail.Number = item.Number; sysSequentialDetail.Number = item.Number;
sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.DurationTime = item.DurationTime;
sysSequentialDetail.SensorID = item.SensorID; sysSequentialDetail.SensorID = item.SensorID;
sysSequentialDetail.WorkTime = item.WorkTime;
sysSequentialDetail.SequenceGroup = item.SequenceGroup;
sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.CreateTime = item.CreateTime;
sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.Sequential = item.Sequential;
sysSequentialDetail.SysSquentialID = item.SysSquentialID; sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@ -399,6 +401,8 @@ namespace InSituLaboratory.ViewModels.Pages
sysSequentialDetail.Number = item.Number; sysSequentialDetail.Number = item.Number;
sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.DurationTime = item.DurationTime;
sysSequentialDetail.SensorID = item.SensorID; sysSequentialDetail.SensorID = item.SensorID;
sysSequentialDetail.WorkTime = item.WorkTime;
sysSequentialDetail.SequenceGroup = item.SequenceGroup;
sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.CreateTime = item.CreateTime;
sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.Sequential = item.Sequential;
sysSequentialDetail.SysSquentialID = item.SysSquentialID; sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@ -517,6 +521,8 @@ namespace InSituLaboratory.ViewModels.Pages
sysSequentialDetail.Number = item.Number; sysSequentialDetail.Number = item.Number;
sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.DurationTime = item.DurationTime;
sysSequentialDetail.SensorID = item.SensorID; sysSequentialDetail.SensorID = item.SensorID;
sysSequentialDetail.WorkTime = item.WorkTime;
sysSequentialDetail.SequenceGroup = item.SequenceGroup;
sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.CreateTime = item.CreateTime;
sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.Sequential = item.Sequential;
sysSequentialDetail.SysSquentialID = item.SysSquentialID; sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@ -635,6 +641,8 @@ namespace InSituLaboratory.ViewModels.Pages
sysSequentialDetail.Number = item.Number; sysSequentialDetail.Number = item.Number;
sysSequentialDetail.DurationTime = item.DurationTime; sysSequentialDetail.DurationTime = item.DurationTime;
sysSequentialDetail.SensorID = item.SensorID; sysSequentialDetail.SensorID = item.SensorID;
sysSequentialDetail.WorkTime = item.WorkTime;
sysSequentialDetail.SequenceGroup = item.SequenceGroup;
sysSequentialDetail.CreateTime = item.CreateTime; sysSequentialDetail.CreateTime = item.CreateTime;
sysSequentialDetail.Sequential = item.Sequential; sysSequentialDetail.Sequential = item.Sequential;
sysSequentialDetail.SysSquentialID = item.SysSquentialID; sysSequentialDetail.SysSquentialID = item.SysSquentialID;

83
InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
View File

@ -235,11 +235,15 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS2}" Margin="0,10"> <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS2}" Margin="0,10">
@ -271,13 +275,18 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
@ -347,11 +356,15 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS3}" Margin="0,10"> <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS3}" Margin="0,10">
@ -383,13 +396,17 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
@ -459,11 +476,15 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS4}" Margin="0,10"> <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS4}" Margin="0,10">
@ -495,13 +516,18 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
@ -571,11 +597,15 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS5}" Margin="0,10"> <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS5}" Margin="0,10">
@ -607,13 +637,17 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding num}" FontWeight="Normal" Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<!--操作--> <!--操作-->
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" <Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink> CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
@ -631,7 +665,6 @@
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>