diff --git a/Aucma.Scada.UI/App.xaml b/Aucma.Scada.UI/App.xaml
index 0b226d26..2af61594 100644
--- a/Aucma.Scada.UI/App.xaml
+++ b/Aucma.Scada.UI/App.xaml
@@ -6,6 +6,21 @@
     <Application.Resources>
         <!--Button样式-->
         <ResourceDictionary>
+            <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="TextBox">
+                            <Grid>
+                                <ScrollViewer x:Name="PART_ContentHost" Margin="0" VerticalAlignment="Center"/>
+                                <Rectangle StrokeThickness="0" Height="1" VerticalAlignment="Bottom" Fill="Gray"/>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="templates/style/resourceStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
index 9c687dae..adc82de1 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
-             mc:Ignorable="d"  
+             mc:Ignorable="d"  FontFamily="Microsoft YaHei"
             d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
   
     <UserControl.Resources>
@@ -118,27 +118,27 @@
                                 </Grid.RowDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="工位名称" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding StationName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding StationName}" Foreground="#FFFFFF" 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="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding OrderCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding OrderCode}" Foreground="#FFFFFF" 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="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding PlanCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanCode}" Foreground="#FFFFFF" 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="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding ProductModel}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ProductModel}" Foreground="#FFFFFF" 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="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding BeginTime}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding BeginTime}" Foreground="#FFFFFF" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
index 0cee6b13..e40f1e05 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
@@ -5,9 +5,72 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
         xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
-        mc:Ignorable="d"
+        mc:Ignorable="d"  WindowStartupLocation="CenterScreen"  FontFamily="Microsoft YaHei" 
         Title="MES生产计划" Height="650" Width="900" Name="window" Background="#1152AC"   
         ResizeMode="NoResize" >
+    <Window.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+
+        <Style TargetType="DataGrid">
+            <!--网格线颜色-->
+            <Setter Property="CanUserResizeColumns" Value="false"/>
+            <Setter Property="Background" Value="#1152AC" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="HorizontalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#4285DE"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="VerticalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#1152AC"/>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <!--列头标题栏样式-->
+        <Style TargetType="DataGridColumnHeader">
+            <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
+           <Setter Property="VerticalContentAlignment" Value="Center"/>-->
+            <!--<Setter Property="Background" Value="#dddddd"/>
+           <Setter Property="Foreground" Value="Black"/>-->
+            <!--<Setter Property="BorderThickness" Value="1" />-->
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Background" Value="#4285DE"/>
+            <Setter Property="Foreground" Value="White"/>
+        </Style>
+
+        <!--单元格样式-->
+        <Style TargetType="DataGridCell">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}" >
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#4285DE"/>
+                    <!--<Setter Property="Foreground" Value="#dddddd"/>-->
+                </Trigger>
+            </Style.Triggers>
+
+        </Style>
+    </Window.Resources>
 
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
         <Border.Effect>
@@ -15,7 +78,7 @@
         </Border.Effect>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="3*"/>
+                <RowDefinition Height="4*"/>
                 <RowDefinition Height="7*"/>
                 <RowDefinition Height="2*"/>
             </Grid.RowDefinitions>
@@ -27,7 +90,7 @@
                     </Grid.RowDefinitions>
                     <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
                         <TextBlock Text="工单编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
                         <!--resourceStyle 413行修改边框颜色-->
                         <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
                         <Button Content="重    置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" Margin="20,0,0,0" FontSize="18" Height="40"  BorderThickness="1"  />
@@ -102,11 +165,11 @@
                     </Grid.RowDefinitions>
                     <!--<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                         <TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="20" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ProductPlanCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                         <TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF"/>
-                        <TextBox FontSize="20" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding MaterialCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                         <TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF"/>
-                        <TextBox FontSize="20" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="30" Margin="5,0,10,0"/>
                     </StackPanel>-->
                     <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
                         <!--<Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />-->
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
index 37ef81e1..eea3c762 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
-        mc:Ignorable="d"
+        mc:Ignorable="d" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
         Title="下达数量"  Height="500" Width="700" Name="window" Background="White"
         ResizeMode="NoResize" >
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
@@ -34,24 +34,24 @@
 
                     <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="计划编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="planCode" FontSize="20" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" x:Name="planCode" FontSize="20" Text="{Binding PlanInfo.planCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="工单编号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="orderCode" FontSize="20" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" x:Name="orderCode" FontSize="20" Text="{Binding PlanInfo.orderCode}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="产品型号" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox x:Name="materialCode" FontSize="20" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" x:Name="materialCode" FontSize="20" Text="{Binding PlanInfo.materialName}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="计划数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="20" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanInfo.planAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
 
                     <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="完成数量" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
-                        <TextBox FontSize="20" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding PlanInfo.completeAmount}" Foreground="#FFFFFF" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -69,7 +69,7 @@
                     </Grid.RowDefinitions>
                     <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Text="下达数量" FontSize="20" Foreground="#FFFFFF" Height="40" Margin="10,0,0,0"/>
-                        <TextBox x:Name="TransmitAmount" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" x:Name="TransmitAmount" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
                     </StackPanel>
 
                     <Border Grid.Row="1" BorderBrush="Black" BorderThickness="0" Margin="10">
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml
index 62448db8..adbb4f6f 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
-        mc:Ignorable="d"
+        mc:Ignorable="d" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
         Title="搜索条件配置" Height="350" Width="600" Name="window" Background="White"
         ResizeMode="NoResize" >
     <Window.Resources>
diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
index b307658d..544698cd 100644
--- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
-             mc:Ignorable="d" Background="#1152AC"   
+             mc:Ignorable="d" Background="#1152AC"    
              d:DesignHeight="750" d:DesignWidth="1920" >
 
     <UserControl.Resources>
@@ -121,17 +121,17 @@
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="箱壳物料条码：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox   FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}"   FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="箱壳物料名称：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="箱壳入库货道：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -148,17 +148,17 @@
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="内胆物料条码：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="内胆物料名称：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                     <TextBlock Text="内胆入库货道：" FontSize="20" Foreground="#FFFFFF"/>
-                                    <TextBox FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                    <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -223,7 +223,7 @@
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,0">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
                         <TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
-                        <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" Width="150" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
                         <!--resourceStyle 413行修改边框颜色-->
 
                         <TextBlock Text="仓库类型" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
index a9b2f4ca..6be2bf30 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-             mc:Ignorable="d" Background="#1152AC"   
+             mc:Ignorable="d" Background="#1152AC"  FontFamily="Microsoft YaHei"  
              d:DesignHeight="750" d:DesignWidth="1920" >
     <Grid Margin="5,5">
         <Grid.RowDefinitions>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
index 08170b31..edb045e8 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" 
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
-             mc:Ignorable="d" Background="#1152AC"   
+             mc:Ignorable="d" Background="#1152AC"   FontFamily="Microsoft YaHei"
              d:DesignHeight="450" d:DesignWidth="800">
   
     <UserControl.Resources>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
index 29fbdbd2..f614ea46 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-        mc:Ignorable="d" Background="#1152AC"   
+        mc:Ignorable="d" Background="#1152AC"   FontFamily="Microsoft YaHei"
         Title="物料库存统计" Height="650" Width="1000" Name="window" 
         ResizeMode="NoResize" >
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
index 66d578a7..b29ab149 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" 
+             xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"  FontFamily="Microsoft YaHei"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Background="#1152AC"   >
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
index e4b280bd..ac76379a 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
@@ -4,8 +4,72 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
-        mc:Ignorable="d" Background="#1152AC"   
+        mc:Ignorable="d" Background="#1152AC"    FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen"
         Title="{Binding TitleName}" Height="450" Width="800" Name="window" ResizeMode="NoResize" >
+    <Window.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20"/>
+        </Style>
+
+        <Style TargetType="DataGrid">
+            <!--网格线颜色-->
+            <Setter Property="CanUserResizeColumns" Value="false"/>
+            <Setter Property="Background" Value="#1152AC" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="HorizontalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#4285DE"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="VerticalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#1152AC"/>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <!--列头标题栏样式-->
+        <Style TargetType="DataGridColumnHeader">
+            <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
+           <Setter Property="VerticalContentAlignment" Value="Center"/>-->
+            <!--<Setter Property="Background" Value="#dddddd"/>
+           <Setter Property="Foreground" Value="Black"/>-->
+            <!--<Setter Property="BorderThickness" Value="1" />-->
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Background" Value="#4285DE"/>
+            <Setter Property="Foreground" Value="White"/>
+        </Style>
+
+        <!--单元格样式-->
+        <Style TargetType="DataGridCell">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}" >
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#4285DE"/>
+                    <!--<Setter Property="Foreground" Value="#dddddd"/>-->
+                </Trigger>
+            </Style.Triggers>
+
+        </Style>
+    </Window.Resources>
+
     <Border Margin="5" Background="#1152AC"    CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
@@ -18,11 +82,11 @@
             </Grid.RowDefinitions>
             <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
-                    <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="20"/>
-                    <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
+                    <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" />
+                    <TextBox   Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
                     <!--resourceStyle 413行修改边框颜色-->
-                    <TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="20" Margin="20,0,0,0"/>
-                    <TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="20"/>
+                    <TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
+                    <TextBox   Style="{StaticResource TextBoxStyle}" Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
 
                     <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" FontSize="18" Width="80" />
@@ -30,13 +94,13 @@
                 </StackPanel>
             </Border>
             <!--计划列表-->
-            <Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+            <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
                 <DataGrid Name="dataGrid" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent" 
                       FontSize="20" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="Gray" SelectedItem="{Binding SelectedDataItem}">
+                      Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}">
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*"  IsReadOnly="True"/>
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
index 5673d726..afdd8667 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"  FontFamily="Microsoft YaHei"
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="400">
diff --git a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
index c20bf021..560e54f9 100644
--- a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" FontFamily="Microsoft YaHei"
               d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
     <UserControl.Resources>
         <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
@@ -120,17 +120,17 @@
                                         </Grid.ColumnDefinitions>
                                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="箱壳物料条码：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ShellMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="箱壳物料名称：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ShellMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="箱壳入库货道：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding ShellSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -147,17 +147,17 @@
                                         </Grid.ColumnDefinitions>
                                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="内胆物料条码：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerMaterialCode}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="内胆物料名称：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerMaterialName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
 
                                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <TextBlock Text="内胆入库货道：" FontSize="20" Foreground="#FFFFFF"/>
-                                            <TextBox FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
+                                            <TextBox   Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding LinerSpaceName}" Foreground="#FFFFFF" Width="200" IsReadOnly="True"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -209,13 +209,13 @@
                 <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
                         <TextBlock Text="任务编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding TaskCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
                         <TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
                         <TextBlock Text="计划编号" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="20" Margin="20,0,0,0"/>
-                        <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
+                        <TextBox   Style="{StaticResource TextBoxStyle}" Width="200" Height="25" Margin="10 0 0 0" Text="{Binding PlanCodeSearch}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="20"/>
 
                         <!--<TextBlock Text="产品型号" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
                         <ComboBox Text="{Binding MaterialTypeCombox}" Width="150" Height="25" Margin="10 0 0 0"  Foreground="Black" VerticalAlignment="Center" FontSize="15">
diff --git a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
index 3d56926f..c3e5cace 100644
--- a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
              xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"  FontFamily="Microsoft YaHei"
              d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC"   >
    
     <UserControl.Resources>