change -将设备请求叫料信号等，从true、false改为红路指示灯

SlnMesnac.WPF/Page/DevMonitorPage.xaml

@@ -122,24 +122,24 @@
 
 
                         <StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                            <Ellipse  Width="30" Height="30" Visibility="Hidden"/>
+                            <Ellipse x:Name="UnpackStatus2" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="设备请求叫料信号:" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Width="200" Foreground="White"/>
-                            <TextBlock  x:Name="UnpackStatus2" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                            <!--<TextBlock  x:Name="UnpackStatus2" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>-->
                         </StackPanel>
                         <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                            <Ellipse  Width="30" Height="30" Visibility="Hidden"/>
+                            <Ellipse x:Name="UnpackStatus3" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="物料到位请求翻转信号:" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0"  Width="200" Foreground="White"/>
-                            <TextBlock  x:Name="UnpackStatus3" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                            <!--<TextBlock  x:Name="UnpackStatus3" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>-->
                         </StackPanel>
                         <StackPanel Grid.Row="6" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                            <Ellipse  Width="30" Height="30" Visibility="Hidden"/>
+                            <Ellipse x:Name="UnpackStatus4" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="设备投料允许翻转信号:" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0"  Width="200" Foreground="White"/>
-                            <TextBlock  x:Name="UnpackStatus4" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                            <!--<TextBlock  x:Name="UnpackStatus4" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>-->
                         </StackPanel>
                         <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                            <Ellipse  Width="30" Height="30" Visibility="Hidden"/>
+                            <Ellipse x:Name="UnpackStatus5" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="请求移走空托盘信号:" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0"  Width="200" Foreground="White"/>
-                            <TextBlock  x:Name="UnpackStatus5" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                            <!--<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">

SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs

@@ -2165,11 +2165,14 @@ namespace SlnMesnac.WPF.Page
                    UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
                    UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
 
-                   UnpackStatus2.Text = unPackStatus2.ToString();
-                   UnpackStatus3.Text = unPackStatus3.ToString();
-                   UnpackStatus4.Text = unPackStatus4.ToString();
-                   UnpackStatus5.Text = unPackStatus5.ToString();
-
+                   //UnpackStatus2.Text = unPackStatus2.ToString();
+                   UnpackStatus2.Fill = unPackStatus2 ? Brushes.Green : Brushes.Red;
+                   //UnpackStatus3.Text = unPackStatus3.ToString();
+                   UnpackStatus3.Fill = unPackStatus3 ? Brushes.Green : Brushes.Red;
+                   //UnpackStatus4.Text = unPackStatus4.ToString();
+                   UnpackStatus4.Fill = unPackStatus4 ? Brushes.Green : Brushes.Red;
+                   //UnpackStatus5.Text = unPackStatus5.ToString();
+                   UnpackStatus5.Fill = unPackStatus5 ? Brushes.Green : Brushes.Red;
                    UnpackStatus7.Fill = unPackStatus7 ? Brushes.Green : Brushes.Red;
                    UnpackStatus8.Fill = unPackStatus8 ? Brushes.Red : Brushes.Green;
 

SlnMesnac.WPF/Page/LocationPage.xaml.cs

@@ -31,7 +31,8 @@ namespace SlnMesnac.WPF.Page
             sqlSugarClient = App.ServiceProvider.GetService<ISqlSugarClient>();
             this.WareHouseId.ItemsSource = new List<string>
             {
-                "二楼仓库","三楼仓库","五楼仓库"
+                "二楼仓库","三楼仓库"
+                //,"五楼仓库"
             };
             WareHouseId.SelectedItem = "三楼仓库";
             loadLocations(GetLocations());