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

ViewModel/MainWindowViewModel.cs

@@ -211,13 +211,20 @@ namespace DyeingComputer.ViewModel
             get { return sys_log; }
             set { sys_log = value; OnPropertyChanged("Sys_log"); }
         }
+        public string program_Name;
+        public string Program_Name  //通知UI控件参数改变
+        {
+            get { return program_Name; }
+            set { program_Name = value; OnPropertyChanged("Program_Name"); }
+        }
         public static int ViewID = 0;//页面id
 
         public static object Name_err = "";
         public static object SYSTime;
         public static object WorkNumder;
         public static object StatusStr;
-        public static object Process_step;
+        public static object Process_step = "-----";
+        public static string ProgramName = "-----";//工艺名
         public static Int32 DIDETime;  //空闲计时器
         bool ERR_JOG;//故障状态
         public void CountDown()
@@ -251,6 +258,8 @@ namespace DyeingComputer.ViewModel
             Work_Temp = Selet_dtm("1010") + "  ℃";
             Work_Numder = WorkNumder.ToString();
             StatusStr = Status_Str;
+            Program_Name = ProgramName;
+            if(dt_TP==null) Process_step = dt_TP.Select("Step=" + RUN_STEPID).First().Field<string>("ParameterName");
 
             if (!SETP_runtime) DIDETime++;