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

View/TechnologicalProcessView.xaml.cs

@@ -243,7 +243,26 @@ namespace DyeingComputer.View
                 ParameterSet_d();
             }
         }//参数设置
-
+        private void DyeingMachine_Click(object sender, RoutedEventArgs e)//染色剂
+        {
+            Receip.Visibility = Visibility.Collapsed;
+            Parameter_set.Visibility = Visibility.Collapsed;
+        }
+        private void Receipt_Click(object sender, RoutedEventArgs e)//领料单
+        {
+            Receip.Visibility = Visibility.Visible;
+            Parameter_set.Visibility = Visibility.Collapsed;
+            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+            SQLiteHelpers.Open();  //打开数据库
+            string sql_script = "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'";
+            Receip.ItemsSource = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].DefaultView;  //转换显示
+            SQLiteHelpers.Close();  //关闭连接
+        }
+        private void ParameterSet_Click(object sender, RoutedEventArgs e)//参数
+        {
+            Parameter_set.Visibility = Visibility.Visible;
+            Receip.Visibility = Visibility.Collapsed;
+        }
         DataTable tblDatas = new DataTable("Datas");
         public static object workName;
         public static SQLiteHelper SQLiteHelpers = null;  //定义数据库
@@ -468,26 +487,6 @@ namespace DyeingComputer.View
                 ";StepID=" + Numder + ";P1=" + P1 + ";P2=" + P2 + ";P3=" + P3 + ";P4=" + P4 + ";P5=" + P5);
          
         }//跳步 
-        private void DyeingMachine_Click(object sender, RoutedEventArgs e)//染色剂
-        {
-            Receip.Visibility = Visibility.Collapsed;
-            Parameter_set.Visibility = Visibility.Collapsed;
-        }
-        private void Receipt_Click(object sender, RoutedEventArgs e)//领料单
-        {
-            Receip.Visibility = Visibility.Visible;
-            Parameter_set.Visibility = Visibility.Collapsed;
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            string sql_script = "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'";
-            Receip.ItemsSource = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].DefaultView;  //转换显示
-            SQLiteHelpers.Close();  //关闭连接
-        }
-        private void ParameterSet_Click(object sender, RoutedEventArgs e)//参数
-        {
-            Parameter_set.Visibility = Visibility.Visible;
-            Receip.Visibility = Visibility.Collapsed;
-        }               
         private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
            // if (MainWindowViewModel.WORK_RUN == 2) GridSTEP.SelectedIndex = MainWindowViewModel.RUN_STEPID - 1;//设定图表显示