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

ViewModel/MainWindowViewModel.cs

@@ -68,12 +68,22 @@ namespace DyeingComputer.ViewModel
             SQLiteHelpers.Close();
 
             WorkNumder = "----------";
+            SYS_SET();  //crbl
             CountDown();   //启动循环任务
             SQL_data();   //读数据库
             UPort();    //启动串口
 
         }
 
+        double ST11;
+        void SYS_SET()
+        {
+            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+            SQLiteHelpers.Open();  //打开数据库
+            ST11 = Convert.ToDouble(SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'ST11'", null));
+            SQLiteHelpers.Close();
+        }
+
         public string work_Temp;  //显示温度
         public string Work_Temp  //通知UI控件参数改变
         {
@@ -129,7 +139,7 @@ namespace DyeingComputer.ViewModel
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
-            Work_Temp = Selet_dtm("1010") + "  ℃";
+            Work_Temp = (Convert.ToDouble(Selet_dta("4001")) + ST11)/10 + "  ℃";
             Work_Numder = WorkNumder.ToString();
          //   Status_Str = "qweqeqwqqfwfqef";
 
@@ -161,7 +171,7 @@ namespace DyeingComputer.ViewModel
             
             if (e.StepID == "001") 
             {
-                
+                updata_dtm("1003",Convert.ToDouble( e.P2));
             }
         }
 
@@ -174,11 +184,6 @@ namespace DyeingComputer.ViewModel
 
 
 
-
-
-
-
-
         public static SerialPort port = new SerialPort();//创建串口
         static ModbusFactory factory = new ModbusFactory();
         // Create Modbus Master
@@ -304,7 +309,7 @@ namespace DyeingComputer.ViewModel
             int index = Convert.ToInt16(arrRows[0]["AIO"].ToString());
             return index;
         }
-        public void updata_dtm(string key,int Value)//更新M寄存器
+        public void updata_dtm(string key,double Value)//更新M寄存器
         {
             DataRow[] arrRows = dt_m.Select("ID="+key);
             int index = dt_m.Rows.IndexOf(arrRows[0]);
@@ -393,7 +398,7 @@ namespace DyeingComputer.ViewModel
         public class DATA_M
         {
             public string IOName { get; set; }
-            public int Value { get; set; }
+            public double Value { get; set; }
             public String ID { get; set; }
         }
         public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new()