Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -62,7 +62,6 @@ namespace formula_manage
         string TEXT_SQLPASWOR;
         string Connstr_SC;
         int ID_N = 1;
-        string DYELOT_;
 
         string Tlist_Weight;
         string Tlist_Proportion;

Windows/Print.xaml.cs

@@ -52,8 +52,7 @@ namespace formula_manage.Windows
         bool Printer;
         bool Printer2;
         bool Printer3;
-        bool Printer4;
-        bool Printer5;
+
 
         string Temp_M, Temp_S;
         private void Window_Print(object sender, RoutedEventArgs e)

Windows/RECIPE.xaml.cs

@@ -160,7 +160,7 @@ namespace formula_manage.Windows
             e.Handled = !re.IsMatch(e.Text);
         }
 
-        private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
+        private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
         {
             Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
             Regex re_char = new Regex(@"^[A-Za-z0-9\s@（)()/+!！_-]+$");//校验用正则表达式由数字,26个英文字母，空白字符和@（)()/+!！_-组成的字符串         

Windows/client.xaml.cs

@@ -32,7 +32,6 @@ namespace formula_manage.Windows
 
         DataTable dataTable = new DataTable();   //建立缓存
 
-        int Button_ID = 0;
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;

Windows/color.xaml.cs

@@ -32,7 +32,6 @@ namespace formula_manage.Windows
 
         DataTable dataTable = new DataTable();   //建立缓存
       
-        int Button_ID = 0;
         string TEXT_SQLIP;
         string TEXT_SQLNAME;
         string TEXT_SQMOD;