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

ViewModel/MainWindowViewModel.cs

@@ -77,12 +77,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             {
             }
         }
-        public string sys_Time;  //显示系统时间
-        public string Sys_Time  //通知UI控件参数改变
-        {
-            get { return sys_Time; }
-            set { sys_Time = value; OnPropertyChanged("Sys_Time"); }
-        }
+       
         public void CountDown()
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
@@ -121,7 +116,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                     //Updata_Machines(Machines, Convert.ToInt16(dt["ID"]), "State", "800");
                 }
             }
+            for (int i = 0; i < Machinesdata_Count; i++)
+            {
+                string mac_s = Selet_Machines(Machines, "State", i).ToString();
+                if ((mac_s == "101") || (mac_s == "201") || (mac_s == "202") || (mac_s == "309"))//获取信息
+                {
+                    MachiensTcpClient[i].SendAsync("SC830" + Selet_Machines(Machines, "SYSKEY", i).ToString());
 
+                }
+            }
         }
         void Tick_Event_5S(object sender, EventArgs e)//Tick_Event周期执行事件5S
         {
@@ -139,15 +142,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         {
             DATA_view();
 
-            for (int i = 0; i < Machinesdata_Count; i++)
-            {
-                string mac_s = Selet_Machines(Machines, "State", i).ToString();
-                if ((mac_s == "101")|| (mac_s == "201") || (mac_s == "202")|| (mac_s == "309"))//获取信息
-                {
-                    MachiensTcpClient[i].SendAsync("SC830" + Selet_Machines(Machines, "SYSKEY", i).ToString());
-
-                }
-            }
+           
         }
 
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
@@ -192,8 +187,19 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         public static int SYS_AT3;
 
 
-
-
+        public string sys_Time;  //显示系统时间
+        public string Sys_Time  //通知UI控件参数改变
+        {
+            get { return sys_Time; }
+            set { sys_Time = value; OnPropertyChanged("Sys_Time"); }
+        }
+        public static string MachineLOG;
+        public string sys_machine;  //显示log
+        public string Sys_machine  //通知UI控件参数改变
+        {
+            get { return sys_machine; }
+            set { sys_machine = value; OnPropertyChanged("Sys_machine"); }
+        }
 
         public static object Selet_Machines(DataTable DB, string name, int key)//查询
         {
@@ -238,14 +244,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.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_TM = new DataTable();
         public static DataTable dt_TP = new DataTable();
         private async void DATA_view()//IO显示
         {
             await Task.Run(() =>
-            {                
+            {
+                try
+                {                  
+                    TechnologicalMachine_View = ToObservableCollection<TechnologicalM>(Machines);
+                }
+                catch (Exception) { }
                 try
                 {
-                    TechnologicalProcess_View = ToObservableCollection<Technological>(dt_TP);
+                    if (dt_TP.Rows.Count > 0)
+                    {
+                        TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
+                        Sys_machine = MachineLOG;
+                    }
                 }
                 catch (Exception) { }
             });
@@ -254,7 +270,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.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<Technological> technologicalProcess_View = new ObservableCollection<Technological>();
+        ObservableCollection<TechnologicalP> technologicalProcess_View = new ObservableCollection<TechnologicalP>();
+        ObservableCollection<TechnologicalM> technologicalMachine_View = new ObservableCollection<TechnologicalM>();
         public ObservableCollection<DATA_A> SYSData_A
         {
 
@@ -285,9 +302,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 RaisePropertyChanged("SYSData_M");
             }
         }
-        public ObservableCollection<Technological> TechnologicalProcess_View
+        public ObservableCollection<TechnologicalP> TechnologicalProcess_View
         {
-
             get { return technologicalProcess_View; }
             set
             {
@@ -295,6 +311,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 RaisePropertyChanged("TechnologicalProcess_View");
             }
         }
+        public ObservableCollection<TechnologicalM> TechnologicalMachine_View
+        {
+            get { return technologicalMachine_View; }
+            set
+            {
+                technologicalMachine_View = value;
+                RaisePropertyChanged("TechnologicalMachine_View");
+            }
+        }
         public class DATA_A
         {
             public string IOName { get; set; }
@@ -319,7 +344,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             public string PLC { get; set; }
             public string type { get; set; }
         }
-        public class Technological
+        public class TechnologicalP
         {
             public string ProgramID { get; set; }
             public string Program { get; set; }
@@ -332,13 +357,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             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 class TechnologicalM
+        {
+            public string Name { get; set; }
+            public string WorkOrder { get; set; }
+            public string Dyelot { get; set; }
+            public string Temperature { get; set; }
+            public string WaterLevel { get; set; }
+            public string Process { get; set; }
+            public string Step { get; set; }
+            public string Message { get; set; }
+           
+        }
         public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new()
         {
             Type t = typeof(T);