wenjy
/
JYHB.SlnMesnac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-添加设备状态明显展示

Browse Source
dev
liuwf 3 months ago
parent dcf435df4e
commit 92c803fbbe
3 changed files with 104 additions and 47 deletions
Show Stats Download Patch File Download Diff File

88
SlnMesnac.WPF/Page/DevMonitorPage.xaml
Unescape Escape View File

@ -70,17 +70,18 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="UnpackStatus0" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="拆包机MES允许远程" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="UnpackStatus1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="拆包机系统运行状态" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="UnpackStatus0" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="拆包机MES允许远程" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="UnpackStatus1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="拆包机系统运行状态" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="UnpackStatus7" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@ -138,6 +139,10 @@
<TextBlock x:Name="UnpackStatus5" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="UnpackBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Background="Green" Height="50">
<TextBlock Text="拆包机状态" VerticalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
</Grid>
<!--<DataGrid ItemsSource="{Binding UnPackDataGrid}" Background="Transparent"
@ -146,7 +151,9 @@
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Left"
Foreground="#FFFFFF" Margin="150,41,0,0" Grid.RowSpan="2" >
--><!--resourceStyle 399行修改选中字体颜色--><!--
-->
<!--resourceStyle 399行修改选中字体颜色-->
<!--
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Name}" Header="监听点位" Width="3*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding Value}" Header="监听值" Width="2*" IsReadOnly="True"/>
@ -166,14 +173,16 @@
<TextBox x:Name="UnpackSet3Txt" Text="0.00" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>
<TextBlock Text="螺旋2:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
<TextBox x:Name="UnpackSet4Txt" Text="0.00" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>
--><!--<TextBlock Text="滚筒筛:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
<TextBox x:Name="UnpackSet5Txt" Text="0.00" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>--><!--
-->
<!--<TextBlock Text="滚筒筛:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
<TextBox x:Name="UnpackSet5Txt" Text="0.00" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>-->
<!--
<Button x:Name="UnpackSetButton" Content="频率设定(0-50HZ)" FontSize="20" Width="170" Height="40" VerticalAlignment="Center" Margin="0,0,0,0" Background="Blue" Click="UnpackSetButton_Click" />-->
</StackPanel>
<StackPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
<Button x:Name="StartUnPackButton" Content="拆包机启动" FontSize="20" Background="LimeGreen" Width="120" Height="40" Margin="0 0 20 0" Click="StartUnPackButton_Click" />
<Button x:Name="StartUnPackButton" Content="拆包机启动" FontSize="20" Background="LimeGreen" Width="125" Height="40" Margin="0 0 20 0" Click="StartUnPackButton_Click" />
<Button x:Name="StopUnPackButton" Content="拆包机停止" FontSize="20" Background="OrangeRed" Width="120" Height="40" Margin="0,0,20,0" Click="StopUnPackButton_Click"/>
<Button x:Name="StopUrgentButton" Style="{StaticResource BUTTON_AGREE}" Content="急停" FontSize="20" Background="#E4B74C" Width="120" Height="40" Margin="0,0,0,0" Click="StopUrgentButton_Click"/>
@ -206,13 +215,14 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="HotSignal1_1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="烘干机螺旋状态:" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
<TextBlock x:Name="HotSignal1_1_Value" Text="停止" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="HotSignal1_1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="烘干机螺旋状态:" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
<TextBlock x:Name="HotSignal1_1_Value" Text="停止" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
@ -242,7 +252,7 @@
<Ellipse x:Name="HotSignal4_1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="烘干机燃烧机运行" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel Grid.Row="3" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="HotSignal4_2" VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
<TextBlock Text="烘干机存在报警" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
@ -285,6 +295,15 @@
<TextBox x:Name="HotTempTxt" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="30,0,10,0" Foreground="White"/>
<Button x:Name="HotTempSet" Content="烘干机温度设定" FontSize="20" Width="150" Height="40" VerticalAlignment="Center" Margin="0,0,20,0" Background="Blue" Click="HotTempSet_Click" />
</StackPanel>-->
<StackPanel x:Name="HotSpiralBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="螺旋状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="HotFansBackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="风机状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="HotBurnBackColor" Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="燃烧状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
</Grid>
<StackPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
@ -320,6 +339,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="MagNetStatus1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@ -337,6 +357,13 @@
<Ellipse x:Name="MagNetStatus4" VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
<TextBlock Text="磁选机设备报警" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="MagNetShakeBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="磁选机震动" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="MagNetBackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="磁选机磁选" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
</Grid>
<StackPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
<Button x:Name="StartMagNetButton" Style="{StaticResource BUTTON_AGREE}" Content="磁选启动" FontSize="20" Background="LimeGreen" Width="150" Height="40" Margin="0 0 20 0" Click="StartMagNetButton_Click"/>
@ -354,7 +381,12 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<StackPanel x:Name="DustBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="除尘状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
<!--<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="MagNetStatus11" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
<TextBlock Text="磁选机震动启动" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
@ -394,15 +426,16 @@
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="82.238"/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="0.3*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
<Ellipse x:Name="SpiralSignal0" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@ -438,6 +471,15 @@
<Ellipse x:Name="SpiralSignal5" VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
<TextBlock Text="螺旋2变频器报警" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="Spiral1BackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="螺旋1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
<StackPanel x:Name="Spiral2BackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Background="Green" Margin="0,3" Height="50">
<TextBlock Text="螺旋2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
</StackPanel>
</Grid>
<StackPanel Grid.Row="2" VerticalAlignment="Top" Orientation="Horizontal" HorizontalAlignment="Center">

17
SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
Unescape Escape View File

@ -1965,6 +1965,8 @@ namespace SlnMesnac.WPF.Page
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
UnpackBackColor.Background = UnPack_Status? Brushes.Green : Brushes.Red;
UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
@ -2029,7 +2031,7 @@ namespace SlnMesnac.WPF.Page
/// <summary>
/// 磁选机参数监控
/// 磁选机参数监控 / 除尘
/// </summary>
private void RefreshMagNet(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
{
@ -2039,9 +2041,15 @@ namespace SlnMesnac.WPF.Page
bool MagNet_Status = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机磁选启动"));
bool MagNet_MesUse_Flag = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机MES允许远程"));
bool signal3 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机设备故障反馈"));
//除尘变频器状态
bool DustStatus = plc.readBoolByAddress("DB4.DBX148.0");
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
DustBackColor.Background = DustStatus ? Brushes.Green : Brushes.Red;
MagNetShakeBackColor.Background = MagNet_Shake_Status? Brushes.Green : Brushes.Red;
MagNetBackColor.Background = MagNet_Status ? Brushes.Green : Brushes.Red;
MagNetStatus1.Fill = MagNet_Shake_Status ? Brushes.Green : Brushes.Red;
MagNetStatus2.Fill = MagNet_Status ? Brushes.Green : Brushes.Red;
MagNetStatus3.Fill = MagNet_MesUse_Flag ? Brushes.Green : Brushes.Red;
@ -2096,6 +2104,9 @@ namespace SlnMesnac.WPF.Page
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
Spiral1BackColor.Background = Spiral1_Status ? Brushes.Green : Brushes.Red;
Spiral2BackColor.Background = Spiral2_Status ? Brushes.Green : Brushes.Red;
SpiralSignal0.Fill = Spiral1_MesUse_Flag ? Brushes.Green : Brushes.Red;
SpiralSignal1.Fill = Spiral2_MesUse_Flag ? Brushes.Green : Brushes.Red;
SpiralSignal2.Fill = Spiral1_Status ? Brushes.Green : Brushes.Red;
@ -2179,6 +2190,10 @@ namespace SlnMesnac.WPF.Page
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
HotSpiralBackColor.Background = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
HotFansBackColor.Background = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;
HotBurnBackColor.Background = Hot_Burn_Status == 1 ? Brushes.Green : Brushes.Red;
HotSignal1_1.Fill = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
HotSignal1_1_Value.Text = ChangeHotStatus(Hot_Spiral_Status);
HotSignal2_1.Fill = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;

2
SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
Unescape Escape View File

@ -299,7 +299,7 @@ namespace SlnMesnac.WPF.ViewModel
{
List<WmsProductInstock> list;
list = await sqlClient.AsTenant().GetConnection("mes").Queryable<WmsProductInstock>().Where(x => x.warehouseId == 231 && x.updateDate >= beginDate && x.updateDate <= endDate).OrderByDescending(t => t.updateDate).ToListAsync();
list = await sqlClient.AsTenant().GetConnection("mes").Queryable<WmsProductInstock>().Where(x => x.warehouseId == 231 && x.beginTime >= beginDate && x.beginTime <= endDate).OrderByDescending(t => t.beginTime).ToListAsync();
if (list != null && list.Count > 0)
{

Write Preview
Loading…
Cancel
Save