Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Windows/APP_set.xaml

@@ -4,10 +4,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
-        mc:Ignorable="d" Loaded="Window_SET"
+        mc:Ignorable="d" Loaded="Window_SET" BorderBrush="White" Background="#FFEFEFEF"
-        Title="APP_set" Height="450" Width="800">
+        Title="APP_set" Height="450" Width="800" MaxHeight="450" MaxWidth="800" ResizeMode="NoResize">
     <Grid>
         <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"/>
 
     </Grid>
 </Window>

Windows/APP_set.xaml.cs

@@ -27,12 +27,14 @@ namespace formula_manage.Windows
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
         bool Loginlink;
+        bool Loginprint;
         private void Window_SET(object sender, RoutedEventArgs e)
         {
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
 
             Login_LINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
+            Login_PRINT.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L2"));  //是否立即打印料单
 
         }
         private void Login_LINK_Checked(object sender, RoutedEventArgs e)
@@ -41,5 +43,12 @@ namespace formula_manage.Windows
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
             Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
         }
+
+        private void Login_PRINT_Checked(object sender, RoutedEventArgs e)
+        {
+            Loginprint = Login_PRINT.IsChecked.GetValueOrDefault();    //是否立即打印料单
+            UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
+            Configini.IniWritevalue("SOFTWARE_SET", " L2", Loginprint.ToString());
+        }
     }
 }