change - UI主题修改

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -224,6 +224,10 @@
       <Project>{89a1edd9-d79e-468d-b6d3-7d07b8843562}</Project>
       <Name>HighWayIot.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HighWayIot.Config\HighWayIot.Config.csproj">
+      <Project>{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}</Project>
+      <Name>HighWayIot.Config</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HighWayIot.Log4net\HighWayIot.Log4net.csproj">
       <Project>{deabc30c-ec6f-472e-bd67-d65702fdaf74}</Project>
       <Name>HighWayIot.Log4net</Name>

Aucma.Scada.UI/MainWindow.xaml

@@ -10,7 +10,7 @@
         >
         <!--WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize"Topmost="True"-->
 
-    <Border Margin="5" Background="#0D306E" CornerRadius="10">
+    <Border Margin="5" Background="White" CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
         </Border.Effect>
@@ -21,13 +21,13 @@
                 <RowDefinition Height="7*"/>
                 <RowDefinition Height="0.7*"/>
             </Grid.RowDefinitions>
-            <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
+            <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="#0288d1" Margin="2,2">
 
             </Border>
-            <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
+            <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
                 <ContentControl Content="{Binding UserContent}"/>
             </Border>
-            <Border Grid.Row="2" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
+            <Border Grid.Row="2" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="2,2">
 
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -168,7 +168,7 @@
                                         </Ellipse>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="箱壳扫码器" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
+                                        <TextBlock Text="箱壳扫码器" FontSize="15" Foreground="Gray" Margin="2,0,10,0"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
@@ -199,7 +199,7 @@
                                         </Ellipse>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="内胆扫码器" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
+                                        <TextBlock Text="内胆扫码器" FontSize="15" Foreground="Gray" Margin="2,0,10,0"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
@@ -230,7 +230,7 @@
                                         </Ellipse>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="PLC状态" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
+                                        <TextBlock Text="PLC状态" FontSize="15" Foreground="Gray" Margin="2,0,10,0"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>

Aucma.Scada.UI/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Aucma.Scada.UI.viewModel;
+using HighWayIot.Config;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,6 +27,7 @@ namespace Aucma.Scada.UI
             InitializeComponent();
             MainViewModel mainViewModel = new MainViewModel();
             this.DataContext = mainViewModel;
+
         }
     }
 }

Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml

@@ -36,28 +36,28 @@
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="工位名称" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding StationName}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                            <TextBlock Text="工位名称" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding StationName}" Foreground="Gray" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="订单编号" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding OrderCode}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                            <TextBlock Text="订单编号" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding OrderCode}" Foreground="Gray" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="计划编号" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding PlanCode}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                            <TextBlock Text="计划编号" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding PlanCode}" Foreground="Gray" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="产品型号" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding ProductModel}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                            <TextBlock Text="产品型号" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding ProductModel}" Foreground="Gray" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="开始时间" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding BeginTime}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                            <TextBlock Text="开始时间" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding BeginTime}" Foreground="Gray" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -131,7 +131,7 @@
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="White" >
+                      Foreground="Gray" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="1*"  IsReadOnly="True"/>
@@ -143,10 +143,10 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <Button Content="上移" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
-                                        <Button Content="下移" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                        <Button Content="删除" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                        <Button Content="下传" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                        <Button Content="上移" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="Gray" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                        <Button Content="下移" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="Gray" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                        <Button Content="删除" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="Gray" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                        <Button Content="下传" CommandParameter="{Binding userName}" Background="#007DFA" Foreground="Gray" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
                                     </StackPanel>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
@@ -158,13 +158,13 @@
                 <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0">
 
-                        <TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="White" FontSize="15" Margin="20,0,0,0"/>
+                        <TextBlock Text="执行方式" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
                         <ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
                             <ComboBoxItem Content="手动" IsSelected="True"/>
                             <ComboBoxItem Content="自动" />
                         </ComboBox>
 
-                        <Button Content="计划维护" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="计划维护" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="Gray" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
                     </StackPanel>
                 </Border>
             </Grid>

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -37,18 +37,18 @@
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="箱壳物料条码：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="箱壳物料条码：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="箱壳物料名称：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="箱壳物料名称：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="箱壳入库货道：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="箱壳入库货道：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -64,18 +64,18 @@
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="内胆物料条码：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="内胆物料条码：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="内胆物料名称：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="内胆物料名称：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
 
                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                            <TextBlock Text="内胆入库货道：" FontSize="15" Foreground="White"/>
-                            <TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="White" Width="200" IsReadOnly="True"/>
+                            <TextBlock Text="内胆入库货道：" FontSize="15" Foreground="Gray"/>
+                            <TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="Gray" Width="200" IsReadOnly="True"/>
                         </StackPanel>
                     </Grid>
                 </Border>
@@ -107,19 +107,19 @@
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                        <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="White" FontSize="15"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="White" VerticalAlignment="Center" FontSize="15"/>
+                        <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="Gray" FontSize="15"/>
+                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
                         <!--resourceStyle 413行修改边框颜色-->
 
-                        <TextBlock Text="物料类型" VerticalAlignment="Center" Foreground="White" FontSize="15" Margin="20,0,0,0"/>
+                        <TextBlock Text="物料类型" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
                         <ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
                             <ComboBoxItem Content="所有" IsSelected="True"/>
                             <ComboBoxItem Content="箱壳" />
                             <ComboBoxItem Content="内胆" />
                         </ComboBox>
 
-                        <Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="white" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
-                        <Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="white" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
                     </StackPanel>
                 </Border>
                 <DataGrid Grid.Row="1" ItemsSource="{Binding InstoreTask}" Background="Transparent" 
@@ -127,7 +127,7 @@
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="White" >
+                      Foreground="Gray" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="100" IsReadOnly="True"/>
@@ -142,7 +142,7 @@
         </Border>
         <!--日志信息-->
         <Border Grid.Row="1" Grid.Column="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
-            <ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground="White" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
+            <ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground="Gray" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
         </Border>
     </Grid>
 </UserControl>

Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="12*"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-            <TextBlock Text="内胆库实时库存" FontSize="20" FontWeight="Bold" Foreground="White"/>
+            <TextBlock Text="内胆库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/>
         </StackPanel>
         <ItemsControl Grid.Row="1"  ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
             <ItemsControl.ItemsPanel>
@@ -36,8 +36,8 @@
                             <Setter Property="Template" TargetName="ctrl">
                                 <Setter.Value>
                                     <ControlTemplate >
-                                        <Border Margin="5,5" Background="Transparent" BorderBrush="White" BorderThickness="2" >
-                                            <Grid>
+                                        <Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
+                                            <Grid Margin="3,3">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
                                                     <RowDefinition/>

Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml

@@ -17,7 +17,7 @@
             <RowDefinition Height="12*"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-            <TextBlock Text="箱壳库实时库存" FontSize="20" FontWeight="Bold" Foreground="White"/>
+            <TextBlock Text="箱壳库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/>
         </StackPanel>
         <ItemsControl Grid.Row="1"  ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
             <ItemsControl.ItemsPanel>
@@ -37,8 +37,8 @@
                             <Setter Property="Template" TargetName="ctrl">
                                 <Setter.Value>
                                     <ControlTemplate >
-                                        <Border Margin="5,5" Background="Transparent" BorderBrush="White" BorderThickness="2" >
-                                            <Grid>
+                                        <Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
+                                            <Grid Margin="3,3">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
                                                     <RowDefinition/>

Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml

@@ -6,8 +6,8 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="400">
-    <Border Margin="5,5" Background="Green" BorderBrush="Blue" BorderThickness="2" CornerRadius="10">
-        <Grid>
+    <Border Margin="5,5" Background="#0288d1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="10">
+        <Grid Margin="3,3">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>

Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml

@@ -29,7 +29,7 @@
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="White" >
+                     Foreground="Gray" >
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="*"  IsReadOnly="True"/>
@@ -52,7 +52,7 @@
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" 
-                      Foreground="White" >
+                     Foreground="Gray" >
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="*"  IsReadOnly="True"/>

Aucma.Scada.UI/bin/Debug/Log/2023-09-22/LogInfo.txt

@@ -154,4 +154,32 @@
 日志时间：2023-09-22 15:32:52,864 [1] 
 日志级别：INFO  
 日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:35:10,785 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:36:27,991 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:37:41,431 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:38:34,804 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:39:29,806 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:56:45,087 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 16:34:11,056 [1] 
+日志级别：INFO  
+日志内容：程序退出 
  

Aucma.Scada.UI/bin/Debug/Log/2023-09-25/LogInfo.txt

@@ -0,0 +1,33 @@
+<-------------->
+日志时间：2023-09-25 08:35:54,739 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 09:02:29,245 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 09:03:38,025 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 09:10:00,710 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 09:10:45,419 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 16:40:18,308 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 17:22:55,289 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-25 17:24:31,735 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ 

Aucma.Scada.UI/bin/Debug/config/App.Ini

@@ -0,0 +1,3 @@
+[system]
+mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
+scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-745ef1664c1dc9d016c34cebb9c5ae6d62a500b4
+76072a90985ce524b5f5a917ac79a52c4bbb3085

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt

@@ -70,6 +70,23 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\Inve
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
@@ -78,6 +95,7 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll
@@ -91,6 +109,7 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.W
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\log4net.dll
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config
@@ -105,23 +124,6 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveChar
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.baml
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache

@@ -13,7 +13,7 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 12777446641
 
 26391768726
-132398445931
+133-1652450246
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 False

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache

@@ -13,7 +13,7 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 12777446641
 
 27-362801058
-132398445931
+133-1652450246
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 True

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref

@@ -1,4 +1,4 @@
-
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
 FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
 FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
 FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;

Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,62 +1,2 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
+
 

Aucma.Scada.UI/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FAD2E1202A318BE107AAB3208A871ED46D7ECCC24EDA4EA9A784B7D0A671757A"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0049F25A81546EA8F0622662E2A02FDBB3147217F5823D6C4B4064082EEE5CF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FAD2E1202A318BE107AAB3208A871ED46D7ECCC24EDA4EA9A784B7D0A671757A"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0049F25A81546EA8F0622662E2A02FDBB3147217F5823D6C4B4064082EEE5CF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DDA851D3EBB171A733E4F093D29225C5D376D9A4F5E09477AC080F28070FFE3"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0EE3601C1D8F6CAB6C93A3BE978F518B2D674A8FCFC812D61BFBD931AF7B22"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DDA851D3EBB171A733E4F093D29225C5D376D9A4F5E09477AC080F28070FFE3"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CE0EE3601C1D8F6CAB6C93A3BE978F518B2D674A8FCFC812D61BFBD931AF7B22"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6AE98CFD2D24F6ADE85660E9DA3AB0F584118FC1434531A45BE5EEB1EFD4B0D0"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D4A475509A839AD08BFC3E9338BC8D2DD750173D4B99A2970061CEDFE52FC88E"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6AE98CFD2D24F6ADE85660E9DA3AB0F584118FC1434531A45BE5EEB1EFD4B0D0"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D4A475509A839AD08BFC3E9338BC8D2DD750173D4B99A2970061CEDFE52FC88E"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CDCEB5F75A9342672B39FEB95788B98034AD71B6C14F17F56F71EE85026FA1EA"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "328477CC1F7F481427519CAF0D6162DADCB3DF5207A76CAFD07D034397645AFB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CDCEB5F75A9342672B39FEB95788B98034AD71B6C14F17F56F71EE85026FA1EA"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "328477CC1F7F481427519CAF0D6162DADCB3DF5207A76CAFD07D034397645AFB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3504AD405478399001B1774449AB790AC6773878A98A4ED574F4D76F754D9B0C"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D37A6DFFF33607BB9A68A7540E999E4CBCEB4739BA2A6F51F8A04D0785C10C23"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3504AD405478399001B1774449AB790AC6773878A98A4ED574F4D76F754D9B0C"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D37A6DFFF33607BB9A68A7540E999E4CBCEB4739BA2A6F51F8A04D0785C10C23"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CC95C1D4EE2D0CCB8C55F69673F5B1893327E40CA45EA4BE759940665D8C676"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8EA587EB17AE055739834D23FE19D524AF2EBBD47347F76F6AB656DB2D04429"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CC95C1D4EE2D0CCB8C55F69673F5B1893327E40CA45EA4BE759940665D8C676"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8EA587EB17AE055739834D23FE19D524AF2EBBD47347F76F6AB656DB2D04429"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BB27CE25212190E71D85B70E7B4D893FCFC0D8047E3AEC15FFF13C9DC2D8ED3"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "288EEAB9D5E82F5B10E599F42889205BFAF944BD63AD9CDE983A4E6BB70C983A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BB27CE25212190E71D85B70E7B4D893FCFC0D8047E3AEC15FFF13C9DC2D8ED3"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "288EEAB9D5E82F5B10E599F42889205BFAF944BD63AD9CDE983A4E6BB70C983A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

HighWayIot.Common/ExpressionExtensions.cs

@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Common
+{
+    /// <summary>
+    /// 谓词表达式构建器
+    /// </summary>
+    public static class ExpressionExtensions
+    {
+        /// <summary>
+        /// 创建一个值恒为 <c>true</c> 的表达式。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <returns>一个值恒为 <c>true</c> 的表达式。</returns>
+        public static Expression<Func<T, bool>> True<T>() { return p => true; }
+
+        /// <summary>
+        /// 创建一个值恒为 <c>false</c> 的表达式。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <returns>一个值恒为 <c>false</c> 的表达式。</returns>
+        public static Expression<Func<T, bool>> False<T>() { return f => false; }
+
+        /// <summary>
+        /// 使用 Expression.OrElse 的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        public static Expression<T> Or<T>(this Expression<T> left, Expression<T> right)
+        {
+            return MakeBinary(left, right, Expression.OrElse);
+        }
+
+        /// <summary>
+        /// 使用 Expression.AndAlso 的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        public static Expression<T> And<T>(this Expression<T> left, Expression<T> right)
+        {
+            return MakeBinary(left, right, Expression.AndAlso);
+        }
+
+        /// <summary>
+        /// 使用自定义的方式拼接两个 System.Linq.Expression。
+        /// </summary>
+        /// <typeparam name="T">表达式方法类型</typeparam>
+        /// <param name="left">左边的 System.Linq.Expression 。</param>
+        /// <param name="right">右边的 System.Linq.Expression。</param>
+        /// <param name="func"> </param>
+        /// <returns>拼接完成的 System.Linq.Expression。</returns>
+        private static Expression<T> MakeBinary<T>(this Expression<T> left, Expression<T> right, Func<Expression, Expression, Expression> func)
+        {
+            return MakeBinary((LambdaExpression)left, right, func) as Expression<T>;
+        }
+
+        /// <summary>
+        /// 拼接两个 <paramref>
+        ///        <name>System.Linq.Expression</name>
+        ///      </paramref>  ，两个 <paramref>
+        ///                         <name>System.Linq.Expression</name>
+        ///                       </paramref>  的参数必须完全相同。
+        /// </summary>
+        /// <param name="left">左边的 <paramref>
+        ///                          <name>System.Linq.Expression</name>
+        ///                        </paramref> </param>
+        /// <param name="right">右边的 <paramref>
+        ///                           <name>System.Linq.Expression</name>
+        ///                         </paramref> </param>
+        /// <param name="func">表达式拼接的具体逻辑</param>
+        /// <returns>拼接完成的 <paramref>
+        ///                  <name>System.Linq.Expression</name>
+        ///                </paramref> </returns>
+        private static LambdaExpression MakeBinary(this LambdaExpression left, LambdaExpression right, Func<Expression, Expression, Expression> func)
+        {
+            var data = Combinate(right.Parameters, left.Parameters).ToArray();
+
+            right = ParameterReplace.Replace(right, data) as LambdaExpression;
+
+            return Expression.Lambda(func(left.Body, right.Body), left.Parameters.ToArray());
+        }
+
+        /// <summary>
+        /// 合并参数
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <returns></returns>
+        private static IEnumerable<KeyValuePair<T, T>> Combinate<T>(IEnumerable<T> left, IEnumerable<T> right)
+        {
+            var a = left.GetEnumerator();
+            var b = right.GetEnumerator();
+            while (a.MoveNext() && b.MoveNext())
+                yield return new KeyValuePair<T, T>(a.Current, b.Current);
+        }
+    }
+
+    internal sealed class ParameterReplace : ExpressionVisitor
+    {
+        public static Expression Replace(Expression e, IEnumerable<KeyValuePair<ParameterExpression, ParameterExpression>> paramList)
+        {
+            var item = new ParameterReplace(paramList);
+            return item.Visit(e);
+        }
+
+        private readonly Dictionary<ParameterExpression, ParameterExpression> _parameters;
+
+        public ParameterReplace(IEnumerable<KeyValuePair<ParameterExpression, ParameterExpression>> paramList)
+        {
+            _parameters = paramList.ToDictionary(p => p.Key, p => p.Value, new ParameterEquality());
+        }
+
+        protected override Expression VisitParameter(ParameterExpression p)
+        {
+            ParameterExpression result;
+            if (_parameters.TryGetValue(p, out result))
+                return result;
+            return base.VisitParameter(p);
+        }
+
+        #region class: ParameterEquality
+        private class ParameterEquality : IEqualityComparer<ParameterExpression>
+        {
+            public bool Equals(ParameterExpression x, ParameterExpression y)
+            {
+                if (x == null || y == null)
+                    return false;
+
+                return x.Type == y.Type;
+            }
+
+            public int GetHashCode(ParameterExpression obj)
+            {
+                if (obj == null)
+                    return 0;
+
+                return obj.Type.GetHashCode();
+            }
+        }
+        #endregion
+    }
+}

HighWayIot.Common/HighWayIot.Common.csproj

@@ -47,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExpressionExtensions.cs" />
     <Compile Include="IniHelper.cs" />
     <Compile Include="JsonChange.cs" />
     <Compile Include="MsgUtil.cs" />

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0092f4c9cca736a00493309db0126e56a5fc8a73
+49833d6fbe686b51d638355714da53ac8cfb61c1

HighWayIot.Config/AppConfig.cs

@@ -23,7 +23,24 @@ namespace HighWayIot.Config
         }
 
 
-        private AppConfig() { }
+        private AppConfig()
+        {
+            mesConnStr = "Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma";
+
+            scadaConnStr = "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma";
+        }
+
+        public string mesConnStr
+        {
+            get { return iniHelper.IniReadValue("system", "mesConnStr"); }
+            set { iniHelper.IniWriteValue("system", "mesConnStr", value); }
+        }
+
+        public string scadaConnStr
+        {
+            get { return iniHelper.IniReadValue("system", "scadaConnStr"); }
+            set { iniHelper.IniWriteValue("system", "scadaConnStr", value); }
+        }
 
         /// <summary>
         /// 工位编号

HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+d2271f160ded016e3eb4397ec44d8490b0fbc09b

HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt

@@ -0,0 +1,14 @@
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Config.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Config.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\Newtonsoft.Json.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb

HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-59081c031c66312c4725da63a7bc5bcf0307991e
+d199f8aa5ac52e1c08316a8e9502712147ebb37a

HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt

@@ -20,3 +20,11 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighW
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache

HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e061e4de927ddb3fdef27ae1bced63ffbea99d10
+f85d9a697a69d15336b96159f442d1e55a9407b1

HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt

@@ -25,3 +25,12 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayI
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb