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

ViewModel/MainWindowViewModel.cs

@@ -1563,6 +1563,7 @@ namespace DyeingComputer.ViewModel
         public static DataTable dt_d = new DataTable("DIO");
         public static DataTable dt_a = new DataTable("AIO");
         public static DataTable dt_m = new DataTable("M");
+        public static DataTable dt_TP = new DataTable();
         public static void SQL_data()//获得io表
         {
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
@@ -1625,6 +1626,12 @@ namespace DyeingComputer.ViewModel
                     if ((bool)D_view) SYSData_D = ToObservableCollection<DATA_D>(dt_d);
                 }
                 catch (Exception ex) { Name_err = "IO_SYSData_D" + "(" + ex.Message + ")"; }
+                try
+                {
+                    TechnologicalProcess_View = ToObservableCollection<TechnologicalProcess>(dt_TP);
+
+                }
+                catch (Exception) { }
             });
         }
         public static double Selet_dtm(string key)//M寄存器
@@ -1822,6 +1829,7 @@ namespace DyeingComputer.ViewModel
         ObservableCollection<DATA_A> sysData_A = new ObservableCollection<DATA_A>();
         ObservableCollection<DATA_D> sysData_D = new ObservableCollection<DATA_D>();
         ObservableCollection<DATA_M> sysData_M = new ObservableCollection<DATA_M>();
+        ObservableCollection<TechnologicalProcess> technologicalProcess_View = new ObservableCollection<TechnologicalProcess>();
         public ObservableCollection<DATA_A> SYSData_A
         {
 
@@ -1852,6 +1860,16 @@ namespace DyeingComputer.ViewModel
                 RaisePropertyChanged("SYSData_M");
             }
         }
+        public ObservableCollection<TechnologicalProcess> TechnologicalProcess_View
+        {
+
+            get { return technologicalProcess_View; }
+            set
+            {
+                technologicalProcess_View = value;
+                RaisePropertyChanged("TechnologicalProcess_View");
+            }
+        }
         public class DATA_A
         {
             public string IOName { get; set; }
@@ -1876,6 +1894,25 @@ namespace DyeingComputer.ViewModel
             public string PLC { get; set; }
             public string type { get; set; }
         }
+        public class TechnologicalProcess
+        {
+            public string Program { get; set; }
+            public double Step { get; set; }
+            public string StepID { get; set; }
+            public string StepName { get; set; }
+            public string ParameterName { get; set; }
+            public string Parameter1 { get; set; }
+            public string Parameter2 { get; set; }
+            public string Parameter3 { get; set; }
+            public string Parameter4 { get; set; }
+            public string Parameter5 { get; set; }
+            public string Parameter6 { get; set; }
+            public string Parameter7 { get; set; }
+            public string Parameter8 { get; set; }
+            public string Parameter9 { get; set; }
+            public string Parameter10 { get; set; }
+            public string DYELOT { get; set; }
+        }
         public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new()
         {
             Type t = typeof(T);