diff --git a/MainWindow.xaml b/MainWindow.xaml
index 3c830a6..0b5e6dc 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -13,7 +13,11 @@
         <ViewModel:MainWindowViewModel x:Key="MainWindowViewModel"/>
     </Window.Resources>
     <Grid>
-        <Menu IsTabStop="False">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="131*"/>
+            <ColumnDefinition Width="509*"/>
+        </Grid.ColumnDefinitions>
+        <Menu IsTabStop="False" Grid.ColumnSpan="2">
             <MenuItem x:Name="tab" Header="_文件" FontSize="16" Focusable ="False" >
                 <MenuItem Header="_许可证" FontSize="16"/>
                 <Separator/>
@@ -51,45 +55,44 @@
         </Menu>
 
         <TextBox x:Name="USERTIME" Text="{Binding Sys_Time}" HorizontalAlignment="Right" Height="30" Margin="0,0,5,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="14" 
-                 Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
+                 Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False" Grid.Column="1"/>
         <TextBox x:Name="USER" HorizontalAlignment="Right" Height="30" Margin="0,0,155,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100" FontSize="14" 
-          Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
+          Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False" Grid.Column="1"/>
 
-        <Button Content="新工单" HorizontalAlignment="Left" Margin="335,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_NewOrder" Focusable ="False"/>
-        <Button Content="归属订单" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>
-        <Button Content="预设工艺" HorizontalAlignment="Left" Margin="300,105,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>
+        <Button Content="新工单" HorizontalAlignment="Left" Margin="73,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_NewOrder" Focusable ="False" Grid.Column="1"/>
+        <Button Content="归属订单" HorizontalAlignment="Left" Margin="38,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology" Grid.Column="1"/>
+        <Button Content="预设工艺" HorizontalAlignment="Left" Margin="38,105,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology" Grid.Column="1"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,35,0,0" TextWrapping="Wrap" Text="领料单号:" VerticalAlignment="Top" Width="90" FontSize="20" Background="WhiteSmoke"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,70,0,0" TextWrapping="Wrap" Text="流转订单:" VerticalAlignment="Top" Width="90" FontSize="20"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,105,0,0" TextWrapping="Wrap" Text="执行工艺:" VerticalAlignment="Top" Width="90" FontSize="20"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,140,0,0" TextWrapping="Wrap" Text="机台:" VerticalAlignment="Top" Width="80" FontSize="20"/>
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="5,175,0,0" TextWrapping="Wrap" Text="类型:" VerticalAlignment="Top" Width="90" FontSize="20"/>
-        <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,140,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20"/>
-        <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20"/>
-        <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True"/>
-        <TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False"/>
-        <TextBox x:Name="Anew" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 
-                 MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False"/>
+        <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,140,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
+        <TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20" Grid.ColumnSpan="2"/>
+        <ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="38,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True" Grid.Column="1"/>
+        <TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" Grid.ColumnSpan="2"/>
+        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Anew" HorizontalAlignment="Left" Height="30" Margin="38,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" 
+                 MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False" Grid.Column="1"/>
+        <TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False" Grid.ColumnSpan="2"/>
         <ComboBox x:Name="Machine" DisplayMemberPath="Name"
                   ItemsSource="{Binding mac_Machine, Source={StaticResource MainWindowViewModel}}" 
                   HorizontalAlignment="Left" Height="30" Margin="95,140,0,0" VerticalAlignment="Top" Width="120" FontSize="20"
-                  KeyUp="Machine_OnKeyDownd" DropDownClosed="Machine_DropDownClosed" IsEditable="True"/>
-        
+                  KeyUp="Machine_OnKeyDownd" DropDownClosed="Machine_DropDownClosed" InputMethod.IsInputMethodEnabled="False"/>
         <ComboBox x:Name="OrderType" Text="正常单" 
                   HorizontalAlignment="Left" Height="30" Margin="95,175,0,0" VerticalAlignment="Top" Width="120" FontSize="20" 
                   IsTabStop="True" KeyUp="SearchBox_OnKeyDownd" IsEditable="True" IsReadOnly="True">
             <ComboBoxItem Content="正常单"></ComboBoxItem>
             <ComboBoxItem Content="追加单"></ComboBoxItem>
         </ComboBox>
-        <TextBox x:Name="Procedures_N" HorizontalAlignment="Left" Height="30" Margin="300,140,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="85" FontSize="20" 
-                 KeyUp="SearchBox_OnKeyDownd" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
-        <Button Content="+" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,140,0,0" VerticalAlignment="Top" FontSize="10" 
-                Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_up" IsTabStop="False" Focusable ="False"/>
-        <Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,155,0,0" VerticalAlignment="Top" FontSize="10" 
-                Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False"/>
+        <TextBox x:Name="Procedures_N" HorizontalAlignment="Left" Height="30" Margin="38,140,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="85" FontSize="20" 
+                 KeyUp="SearchBox_OnKeyDownd" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Grid.Column="1"/>
+        <Button Content="+" HorizontalAlignment="Left" Height="15" Width="20" Margin="123,140,0,0" VerticalAlignment="Top" FontSize="10" 
+                Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_up" IsTabStop="False" Focusable ="False" Grid.Column="1"/>
+        <Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="123,155,0,0" VerticalAlignment="Top" FontSize="10" 
+                Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False" Grid.Column="1"/>
 
-        <Grid Height="150" Width="405"  Margin="5,210,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top"  Background="#FFF7F7F7">
+        <Grid Height="150" Width="405"  Margin="5,210,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top"  Background="#FFF7F7F7" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="254"/>
                 <ColumnDefinition Width="151"/>
@@ -220,12 +223,12 @@
             </DataGrid.Columns>
         </DataGrid>
 
-        <Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="confirm"/>
-        <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print" IsTabStop="False" Focusable ="False"/>
+        <Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="confirm" Grid.Column="1"/>
+        <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print" IsTabStop="False" Focusable ="False" Grid.Column="1"/>
         <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
         <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
 
-        <Grid Grid.Column="1" Height="325" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
+        <Grid Grid.Column="1" Height="325" Margin="148,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
             <ContentControl x:Name="Deputy"/>
         </Grid>
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3fb8f8e..64caf95 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -225,29 +225,6 @@ namespace formula_manage
             }
         }
 
-        private void Machine_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)  //机台回车跳转功能
-        {
-            if (e.Key == Key.Enter)
-            {
-                if (Machine.Text == "")
-                {
-                    System.Windows.MessageBox.Show("请确认机台");
-                    return;
-                }
-
-                DataRow[] m = MainWindowViewModel.MACHINEdatatemp.Select("Name ='" + Machine.Text + "'"); //查询判断原料代码是否有效
-                if (m.Any())  //检查原料信息
-                {
-                    System.Windows.MessageBox.Show("机台不存在");
-                    Machine.Text = "";
-                    return;
-                }
-
-                UserClass.PressKey.PressKeys(Keys.Tab, false);
-                UserClass.PressKey.PressKeys(Keys.Tab, true);
-            }
-        }       
-
         string Prepose;  //料单前置
         string PreposeT;  //料单时间
         string PreposeS;  //料单序列格式
@@ -261,7 +238,7 @@ namespace formula_manage
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
             Loginprint = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
             Loginanew = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L3"));  //是否立即打印料单
-            Machine.IsReadOnly = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
+            Machine.IsEditable = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L4"));  //允许自定义机台
 
             Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1");  //自定义料单前缀
             PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2");  //自定义料单时间
@@ -411,6 +388,30 @@ namespace formula_manage
             Number_Event();
         }
 
+        private void Machine_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)  //机台回车跳转功能
+        {
+            if (e.Key == Key.Enter)
+            {
+                if (Machine.Text == "")
+                {
+                    System.Windows.MessageBox.Show("请确认机台");
+                    return;
+                }
+
+                DataRow[] m = MainWindowViewModel.MACHINEdatatemp.Select("Name ='" + Machine.Text + "'"); //查询判断原料代码是否有效
+                if (!m.Any())  //检查信息
+                {
+                    System.Windows.MessageBox.Show("机台不存在");
+                    Machine.Text = "";
+                    return;
+                }
+                UserClass.PressKey.PressKeys(Keys.Tab, false);
+                UserClass.PressKey.PressKeys(Keys.Tab, true);
+            }
+        }
+        private void Machine_DropDownClosed(object sender, EventArgs e)//选择机台事件
+        {
+        }
         private void Button_up(object sender, RoutedEventArgs e)//总步加
         {
             int i = int.Parse(Procedures_N.Text);
@@ -460,11 +461,19 @@ namespace formula_manage
                 string listtotal = c.ToString();
                 list_Total.Text = listtotal;
             }
+            DataRow[] r = MainWindowViewModel.MACHINEdatatemp.Select("Name ='" + Machine.Text + "'"); //查询判断原料代码是否有效
+            if (!r.Any()) return;  //检查信息
+            if (double.Parse(r[0].ItemArray[1].ToString()) < a)
+            {
+                System.Windows.MessageBox.Show("超载，确定重量","错误",MessageBoxButton.OK,MessageBoxImage.Error);
+                list_Weight.Text = "0";
+                list_Total.Text = "0";
+                return;
+            }
         }
-
         private void Proportion(object sender, TextChangedEventArgs e)  //浴比输入
         {
-            float a, b, c;
+            float a, b, c=0;
             b = float.Parse(list_Proportion.Text);
             if (list_Weight.Text != "")  //判断比例是否有效
             {
@@ -473,6 +482,15 @@ namespace formula_manage
                 string listtotal = c.ToString();
                 list_Total.Text = listtotal;
             }
+            DataRow[] r = MainWindowViewModel.MACHINEdatatemp.Select("Name ='" + Machine.Text + "'"); //查询判断原料代码是否有效
+            if (!r.Any()) return;  //检查信息
+            if (double.Parse(r[0].ItemArray[2].ToString()) < c)
+            {
+                System.Windows.MessageBox.Show("超量，确定浴比及浴量", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                list_Proportion.Text = "0";
+                list_Total.Text = "0";
+                return;
+            }
         }
 
         string Code_;
@@ -816,9 +834,6 @@ namespace formula_manage
             }
         }
 
-        private void Machine_DropDownClosed(object sender, EventArgs e)//选择机台事件
-        {
-            DYELOT_ = Number.Text;
-        }
+
     }
 }
diff --git a/Windows/APP_set.xaml b/Windows/APP_set.xaml
index 977c546..b6c544a 100644
--- a/Windows/APP_set.xaml
+++ b/Windows/APP_set.xaml
@@ -10,7 +10,7 @@
        
         <CheckBox x:Name="Login_LINK" Height="19" Margin="15,15,605,0" VerticalAlignment="Top" Content="登录页面显示连接状态" IsTabStop="False" Checked="Login_LINK_Checked" Unchecked="Login_LINK_Checked"/>
         <CheckBox x:Name="Login_PRINT" Height="19" Margin="15,35,605,0" VerticalAlignment="Top" Content="确认立即打印料单" IsTabStop="False" Checked="Login_PRINT_Checked" Unchecked="Login_PRINT_Checked"/>
-        <CheckBox x:Name="Login_MACHINE" Height="19" Margin="15,55,605,0" VerticalAlignment="Top" Content="不允许自定义机台号" IsTabStop="False" Checked="Login_MAC_Checked" Unchecked="Login_MAC_Checked"/>
+        <CheckBox x:Name="Login_MACHINE" Height="19" Margin="15,55,605,0" VerticalAlignment="Top" Content="允许输入机台号" IsTabStop="False" Checked="Login_MAC_Checked" Unchecked="Login_MAC_Checked"/>
         <CheckBox x:Name="Login_anew" Height="19" Margin="15,75,605,0" VerticalAlignment="Top" Content="单号相同时重染号修改" IsTabStop="False" Checked="Login_anew_Checked" Unchecked="Login_anew_Checked"/>