diff --git a/Aucma.Core.PrintTo/App.xaml b/Aucma.Core.PrintTo/App.xaml
index 43cfb9af..13736002 100644
--- a/Aucma.Core.PrintTo/App.xaml
+++ b/Aucma.Core.PrintTo/App.xaml
@@ -27,7 +27,7 @@
       
             <!--字体大小设置-->
             <Style TargetType="TextBlock">
-                <Setter Property="FontSize" Value="20"/>
+                <Setter Property="FontSize" Value="18"/>
                 <Setter Property="FontWeight" Value="Bold"/>
                 <Setter Property="FontFamily" Value="Microsoft YaHei"/>
             </Style>
diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
index 88f4f447..dfb914dc 100644
--- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml
+++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
@@ -8,7 +8,7 @@
              d:DesignHeight="800" 
              Background="#1152AC" 
              FontFamily="Microsoft YaHei"
-             d:DesignWidth="1500" FontSize="20">
+             d:DesignWidth="1500" FontSize="18">
     <UserControl.Resources>
         <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
             <!--<Setter Property="Height" Value="40"/>-->
@@ -43,7 +43,7 @@
             <!--<Setter Property="BorderThickness" Value="1" />-->
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="BorderBrush" Value="#dddddd" />
-            <Setter Property="Height" Value="60"/>
+            <Setter Property="Height" Value="50"/>
             <Setter Property="FontSize" Value="16"/>
             <Setter Property="Background" Value="#4285DE"/>
             <Setter Property="Foreground" Value="White"/>
@@ -208,23 +208,23 @@
                     </Grid.RowDefinitions>
 
                     <WrapPanel Grid.Row="0"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="产品编码" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="产品编码" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox  x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="400"  
                            materialDesign:HintAssist.Hint="产品编码"    />
                     </WrapPanel>
 
                     <WrapPanel Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="产品名称" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="产品名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox   x:Name="ProductName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                                    materialDesign:HintAssist.Hint="产品名称" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="物料名称" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="物料名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox   x:Name="MaterialName"  Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                                    materialDesign:HintAssist.Hint="物料名称" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="3"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="打印数量" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <Slider  x:Name="PlanAmount"  FontSize="18" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="White" Height="30" VerticalContentAlignment="Center" 
                                  HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"  Width="{Binding Path=ActualWidth, ElementName=ProductNo}"/>
                         <!--<TextBlock Text="1~500" Width="60" Margin="10 0 0 0"  Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />-->
@@ -232,8 +232,8 @@
                     <Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5" Margin="20 5" >
                         <StackPanel >
                             <WrapPanel Height="300">
-                                <RadioButton   Content="内胆码-L" Foreground="White" FontSize="20" BorderBrush="White"  x:Name="内胆" Margin="30 15" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name, ElementName=内胆}"/>
-                                <RadioButton Content="箱体码-B" Foreground="White" FontSize="20" BorderBrush="White" x:Name="箱体" Margin="30 15" Command="{Binding RadioQueryCommand}"  CommandParameter="{Binding Name, ElementName=箱体}"/>
+                                <RadioButton   Content="内胆码-L" Foreground="White" FontSize="18" BorderBrush="White"  x:Name="内胆" Margin="30 15" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name, ElementName=内胆}"/>
+                                <RadioButton Content="箱体码-B" Foreground="White" FontSize="18" BorderBrush="White" x:Name="箱体" Margin="30 15" Command="{Binding RadioQueryCommand}"  CommandParameter="{Binding Name, ElementName=箱体}"/>
                             </WrapPanel>
                             <!--<Button Content="添加"  Foreground="White" BorderBrush="#0288d1" Background="#4285DE" HorizontalAlignment="Right" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />-->
                         </StackPanel>
diff --git a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
index 1c7c2242..12126a45 100644
--- a/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
+++ b/Aucma.Core.PrintTo/Views/PrintToDevView.xaml
@@ -11,7 +11,8 @@
         d:DesignWidth="700"
         Title="二维码打印" 
         Height="700" 
-        Width="700" 
+        Width="700"
+           FontFamily="Microsoft YaHei"
         WindowStartupLocation="CenterScreen" 
         WindowStyle="ToolWindow"
         >
@@ -23,7 +24,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <UniformGrid Grid.Row="0"  >
-                <GroupBox Margin="16 0" Header="订单信息" >
+                <GroupBox Margin="16 0" Header="订单信息" FontSize="18" >
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition/>
@@ -32,25 +33,25 @@
                         </Grid.RowDefinitions>
                         
                         <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="产品编号" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <TextBox FontSize="18" Text="{Binding ProductCode}"  Width="300" Foreground="White" BorderBrush="White"  Margin="15 0 0 0" VerticalAlignment="Center" IsReadOnly="True"/>
+                            <TextBlock Text="产品编号" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <TextBox FontSize="20" Text="{Binding ProductCode}"  Width="300" Foreground="White" BorderBrush="White"  Margin="15 0 0 0" VerticalAlignment="Center" IsReadOnly="True"/>
                         </WrapPanel>
                         <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="产品型号" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <TextBox Text="{Binding MaterialName}" FontSize="18" Width="300" Foreground="White" BorderBrush="White"  
+                            <TextBlock Text="产品型号" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <TextBox Text="{Binding MaterialName}" FontSize="20" Width="300" Foreground="White" BorderBrush="White"  
                                      Margin="15 0 0 0" 
                                      HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
                         </WrapPanel>
                         <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="打印名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <TextBox Text="{Binding PrintName}"  FontSize="18" Width="300" Foreground="White"  BorderBrush="White" Margin="15 0 0 0" 
+                            <TextBlock Text="打印名称" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <TextBox Text="{Binding PrintName}"  FontSize="20" Width="300" Foreground="White"  BorderBrush="White" Margin="15 0 0 0" 
                                      HorizontalAlignment="Center" VerticalAlignment="Center" />
                         </WrapPanel>
                     </Grid>
                 </GroupBox>
             </UniformGrid>
             <UniformGrid Grid.Row="1" >
-                <GroupBox Margin="16 0" Header="打印详情" >
+                <GroupBox Margin="16 0" Header="打印详情" FontSize="18">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -59,26 +60,26 @@
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="打印进度" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <TextBlock Text="打印进度" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                             <ProgressBar Style="{x:Null}" Height="20" Minimum="1" Maximum="{Binding MaxProgress}" Value="{Binding Progress}" Width="300"  Margin="6"/>
                         </WrapPanel>
                         <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="打印信息" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <TextBox Text="{Binding PrintProgress}" FontSize="18" Width="300" Foreground="White" BorderBrush="White" 
+                            <TextBlock Text="打印信息" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <TextBox Text="{Binding PrintProgress}" FontSize="20" Width="300" Foreground="White" BorderBrush="White" 
                                      Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
                         </WrapPanel>
                         <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Text="打印状态" FontSize="18" Foreground="White" Margin="5"/>
+                            <TextBlock Text="打印状态" FontSize="20" Foreground="White" Margin="5"/>
                             <TextBlock  FontSize="18" Margin="10 0" Background="{Binding State}" Width="20" Height="20" 
                                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            <TextBlock Text="异常条码数量:" Margin="5" FontSize="18" Foreground="White"/>
+                            <TextBlock Text="异常条码数量:" Margin="5" FontSize="20" Foreground="White"/>
                             <TextBlock Text="{Binding ErrorNum}" FontSize="18" Margin="10 0" Width="130" Foreground="White" 
                                        HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </WrapPanel>
                         <WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <Button Content="打印" x:Name="Start" Margin="20 0" Command="{Binding StartOperateCommand}"  IsEnabled="{Binding OperateEnabled,Mode=TwoWay}"/>
-                            <Button Content="暂停" x:Name="Suspend" Margin="20 0" Command="{Binding SuspendOperateCommand}"  IsEnabled="{Binding SuspendEnabled,Mode=TwoWay}" />
-                            <Button Content="关闭" x:Name="Close" Margin="20 0" Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}" />
+                            <Button Content="打印" x:Name="Start" Height="40" FontSize="20" Margin="20 0" Command="{Binding StartOperateCommand}"  IsEnabled="{Binding OperateEnabled,Mode=TwoWay}"/>
+                            <Button Content="暂停" x:Name="Suspend" Height="40" FontSize="20" Margin="20 0" Command="{Binding SuspendOperateCommand}"  IsEnabled="{Binding SuspendEnabled,Mode=TwoWay}" />
+                            <Button Content="关闭" x:Name="Close" Height="40" FontSize="20" Margin="20 0" Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}" />
                         </WrapPanel>
                     </Grid>
                 </GroupBox>
diff --git a/Aucma.Core.PrintTo/Views/SpecialPrintToView.xaml b/Aucma.Core.PrintTo/Views/SpecialPrintToView.xaml
index f4271934..dfba1db2 100644
--- a/Aucma.Core.PrintTo/Views/SpecialPrintToView.xaml
+++ b/Aucma.Core.PrintTo/Views/SpecialPrintToView.xaml
@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
         mc:Ignorable="d"
         Background="#1152AC" 
-          Name="window" 
+        Name="window" 
+           FontFamily="Microsoft YaHei"
         Title="SpecialPrintToView" Height="450" Width="800"   WindowStyle="ToolWindow">
     <Border Margin="5" BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5" >
         <UniformGrid   Margin="16 10" >
@@ -19,26 +20,26 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="打印进度" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock Text="打印进度" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         <ProgressBar Style="{x:Null}" Height="20" Minimum="1" Maximum="{Binding MaxProgress}" Value="{Binding Progress}" Width="300"  Margin="6"/>
                     </WrapPanel>
                     <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="打印信息" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding PrintProgress,Mode=TwoWay}" FontSize="18" Width="300" Foreground="White" BorderBrush="White" 
+                        <TextBlock Text="打印信息" FontSize="20" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBox Text="{Binding PrintProgress,Mode=TwoWay}" FontSize="20" Width="300" Foreground="White" BorderBrush="White" 
                                   Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
                     </WrapPanel>
                     <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="打印状态" FontSize="18" Foreground="White" Margin="5"/>
-                        <TextBlock  FontSize="18" Margin="10 0" Background="{Binding State,Mode=TwoWay}" Width="20" Height="20" 
+                        <TextBlock Text="打印状态" FontSize="20" Foreground="White" Margin="5"/>
+                        <TextBlock  FontSize="20" Margin="10 0" Background="{Binding State,Mode=TwoWay}" Width="20" Height="20" 
                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBlock Text="异常条码数量:" Margin="5" FontSize="18" Foreground="White"/>
-                        <TextBlock Text="{Binding ErrorNum,Mode=TwoWay}" FontSize="18" Margin="10 0" Width="130" Foreground="White"  IsEnabled="True"
+                        <TextBlock Text="异常条码数量:" Margin="5" FontSize="20" Foreground="White"/>
+                        <TextBlock Text="{Binding ErrorNum,Mode=TwoWay}" FontSize="20" Margin="10 0" Width="130" Foreground="White"  IsEnabled="True"
                                     HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </WrapPanel>
                     <WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <Button Content="打印" x:Name="Start" Margin="20 0" Command="{Binding StartOperateCommand}"  IsEnabled="{Binding OperateEnabled,Mode=TwoWay}"/>
-                        <Button Content="暂停" x:Name="Suspend" Margin="20 0" Command="{Binding SuspendOperateCommand}"  IsEnabled="{Binding SuspendEnabled,Mode=TwoWay}" />
-                        <Button Content="关闭" x:Name="Close" Margin="20 0" Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}" />
+                        <Button Content="打印" x:Name="Start" FontSize="20" Height="40" Margin="20 0" Command="{Binding StartOperateCommand}"  IsEnabled="{Binding OperateEnabled,Mode=TwoWay}"/>
+                        <Button Content="暂停" x:Name="Suspend" FontSize="20" Height="40" Margin="20 0" Command="{Binding SuspendOperateCommand}"  IsEnabled="{Binding SuspendEnabled,Mode=TwoWay}" />
+                        <Button Content="关闭" x:Name="Close" FontSize="20" Height="40" Margin="20 0" Command="{Binding CloseWindowCommand}"  CommandParameter="{Binding ElementName=window}" />
                     </WrapPanel>
                 </Grid>
             </GroupBox>
diff --git a/Aucma.Core.PrintTo/Views/SpecialPrintView.xaml b/Aucma.Core.PrintTo/Views/SpecialPrintView.xaml
index a4d82e88..47b8de99 100644
--- a/Aucma.Core.PrintTo/Views/SpecialPrintView.xaml
+++ b/Aucma.Core.PrintTo/Views/SpecialPrintView.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" Background="#0C4CA3" 
+        mc:Ignorable="d" Background="#0C4CA3"    FontFamily="Microsoft YaHei"
         Title="特殊条码打印" Height="450" Width="800" WindowState="Normal" WindowStyle="ToolWindow"
          Name="window"
         >
@@ -85,8 +85,8 @@
                     <UniformGrid Grid.Row="0">
                         <GroupBox Margin="16 0" Header="条码类型" >
                             <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center"   Margin="50 5" >
-                                <RadioButton   Content="放行码" Foreground="White" FontSize="15" IsChecked="True"   Margin="10 0" />
-                                <TextBox Text="{Binding BarCode,Mode=TwoWay}" PreviewMouseDoubleClick="TextBox_PreviewMouseDown"  FontSize="18" Width="300" BorderBrush="White" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <RadioButton   Content="放行码" Foreground="White" FontSize="20" IsChecked="True"   Margin="10 0" />
+                                <TextBox Text="{Binding BarCode,Mode=TwoWay}" PreviewMouseDoubleClick="TextBox_PreviewMouseDown"  FontSize="20" Width="300" BorderBrush="White" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </WrapPanel>
                         </GroupBox>
                     </UniformGrid>
@@ -94,14 +94,14 @@
                         <Border Margin="16 5" BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5"  >
                             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <WrapPanel Margin="5 0">
-                                    <TextBlock   Text="打印数量" Foreground="white"  Margin="10 5" />
-                                    <Slider  x:Name="PrintAmount"  Minimum="0" Value="{Binding PrintNum,Mode=TwoWay}"  Maximum="500"  BorderBrush="White"  Foreground="White" Height="40" VerticalContentAlignment="Center"  HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"   FontSize="15"   Width="300"/>
+                                    <TextBlock   Text="打印数量" Foreground="white"  Margin="10 5" FontSize="20" />
+                                    <Slider  x:Name="PrintAmount"  Minimum="0" Value="{Binding PrintNum,Mode=TwoWay}"  Maximum="500"  BorderBrush="White"  Foreground="White" Height="40" VerticalContentAlignment="Center"  HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"   FontSize="20"   Width="300"/>
                                 </WrapPanel>
                                 <WrapPanel Margin="20" HorizontalAlignment="Center">
-                                    <Button Content="打印" Background="#4285DE" Margin="30 0 0 0"
-                                           Width="100"  Command="{Binding PrintCommand}"  />
-                                    <Button Content="关闭" Background="#4285DE" Margin="20 0"
-                                           Width="100"  Command="{Binding CloseCommand}"  CommandParameter="{Binding   ElementName=window}"/>
+                                    <Button Content="打印" Background="#4285DE" Margin="30 0 0 0" FontSize="20"
+                                          Height="40" Width="100"  Command="{Binding PrintCommand}"  />
+                                    <Button Content="关闭" Background="#4285DE" Margin="20 0" FontSize="20"
+                                         Height="40"  Width="100"  Command="{Binding CloseCommand}"  CommandParameter="{Binding   ElementName=window}"/>
                                 </WrapPanel>
                             </StackPanel>
                         </Border>
diff --git a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml
index a3f1947b..6bd54a33 100644
--- a/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml
+++ b/Aucma.Core.PrintTo/Views/SupplementPrintPageView.xaml
@@ -7,8 +7,8 @@
         xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
         mc:Ignorable="d"
         Background="#0C4CA3"   
-        Title="条码补打"  d:DesignHeight="450"
-             d:DesignWidth="800">
+        Title="条码补打"  d:DesignHeight="600"
+             d:DesignWidth="1000">
     
     <Window.Resources>
         <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
@@ -45,7 +45,7 @@
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="BorderBrush" Value="#dddddd" />
             <Setter Property="Height" Value="40"/>
-            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="FontSize" Value="18"/>
             <Setter Property="Background" Value="#4285DE"/>
             <Setter Property="Foreground" Value="White"/>
         </Style>
@@ -56,7 +56,7 @@
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="BorderBrush" Value="Gray" />
             <Setter Property="Height" Value="40"/>
-            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="FontSize" Value="18"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type DataGridCell}">
@@ -99,12 +99,11 @@
                                   SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
                             <DataGrid.Columns>
                                 <DataGridTextColumn   Width="*"    Binding="{Binding No}"         Header="编号"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTextColumn   Width="*"    Binding="{Binding ProductCode}"         Header="产品编号"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTextColumn   Width="*"    Binding="{Binding BarCode}"             Header="物料条码"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="1.5*"    Binding="{Binding BarCode}"             Header="物料条码"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn   Width="2*"    Binding="{Binding MaterialCode}"        Header="物料编码"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn   Width="2*"    Binding="{Binding MaterialName}"        Header="物料名称"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="100"    Binding="{Binding SuppleMetNum}"        Header="补打个数"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="200"    Binding="{Binding PrintTime ,StringFormat=\{0:yyyy-MM-dd HH:mm\}}"  Header="打印时间"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding SuppleMetNum}"        Header="补打个数"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding PrintTime ,StringFormat=\{0:yy-MM-dd HH:mm\}}"  Header="打印时间"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                             </DataGrid.Columns>
                         </DataGrid>
                     </UniformGrid>
@@ -122,30 +121,30 @@
                         <RowDefinition Height="auto"/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="产品编码"  FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="300"  
+                        <TextBlock Text="产品编码"  FontSize="20" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBox  x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="150"  
                              materialDesign:HintAssist.Hint="产品编码" BorderBrush="White"  />
                     </WrapPanel>
                     <WrapPanel Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="物料编码" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="MaterialCode" Foreground="white" Text="{Binding SelectedItem.MaterialCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="300"  
+                        <TextBlock Text="物料编码" FontSize="20" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBox  x:Name="MaterialCode" Foreground="white" Text="{Binding SelectedItem.MaterialCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="150"  
                              materialDesign:HintAssist.Hint="物料编码" BorderBrush="White"  />
                     </WrapPanel>
                     <WrapPanel Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="物料名称" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="MaterialName" Foreground="white" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="300"  
+                        <TextBlock Text="物料名称" FontSize="20" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBox  x:Name="MaterialName" Foreground="white" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="150"  
                              materialDesign:HintAssist.Hint="物料名称"  BorderBrush="White" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="3"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="打印条码" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="BarCode" Foreground="white" Text="{Binding SelectedItem.BarCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="300"  
+                        <TextBlock Text="打印条码" FontSize="20" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBox  x:Name="BarCode" Foreground="white" Text="{Binding SelectedItem.BarCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  Width="150"  
                              materialDesign:HintAssist.Hint="打印条码"  BorderBrush="White" />
                     </WrapPanel>
                     
                     <WrapPanel Grid.Row="4" HorizontalAlignment="Center">
                         <Button
                              materialDesign:RippleAssist.IsDisabled="True"
-                             Content="打印" Margin="0 0"   Command="{Binding PrintCommand}"  CommandParameter="{Binding ElementName=BarCode,Path=Text}"/>
+                             Content="打印" Margin="0 0"  Height="40"  Command="{Binding PrintCommand}"  CommandParameter="{Binding ElementName=BarCode,Path=Text}"/>
                     </WrapPanel>
                 </Grid>
             </Border>
diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
index d9d786fd..0c23cabd 100644
--- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
+++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
@@ -373,7 +373,7 @@
                             <lvc:CartesianChart.DataTooltip>
                                 <lvc:DefaultTooltip BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
                             </lvc:CartesianChart.DataTooltip>
-                            <lvc:CartesianChart.AxisX  FontSize ="18">
+                            <lvc:CartesianChart.AxisX>
                                 <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="18" Foreground="White">
                                     <lvc:Axis.Separator>
                                         <lvc:Separator  Step="1" Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >