diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 17b5a3f..05b2241 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -82,12 +82,16 @@ namespace DyeingComputer.ViewModel private int MT39;//中水位 private int MT40;//低水位 private int MT41;//安全水位 - private static int MT90;//呼叫操作员 + private static int MU01;//呼叫操作员 private int S16;//机型 private int SM01;//副缸 private int SM02;//副缸 private int SM03;//副缸 + private double MS01;//1缸温度偏差 + private double MS02;//2缸温度偏差 + private double MS03;//3缸温度偏差 + void SYS_SET() { SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 @@ -113,7 +117,7 @@ namespace DyeingComputer.ViewModel MT39 = Convert.ToInt16(Selet_con("MT39"));// MT40 = Convert.ToInt16(Selet_con("MT40"));// MT41 = Convert.ToInt16(Selet_con("MT41"));// - MT90 = Convert.ToInt16(Selet_con("MT90"));//呼叫操作员 + MU01 = Convert.ToInt16(Selet_con("MU01"));//呼叫操作员 S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息 SM01 = Convert.ToInt16(Selet_sys("SM01"));//FG @@ -362,25 +366,25 @@ namespace DyeingComputer.ViewModel STEP_finish = false; break; case "035": - STEP_TIME = Convert.ToInt32(MT90); + STEP_TIME = Convert.ToInt32(MU01); WORK_RUN = 2; SETP_runtime = true; STEP_finish = false; break; case "036": - STEP_TIME = Convert.ToInt32(MT90); + STEP_TIME = Convert.ToInt32(MU01); WORK_RUN = 2; SETP_runtime = true; STEP_finish = false; break; case "039": - STEP_TIME = Convert.ToInt32(MT90); + STEP_TIME = Convert.ToInt32(MU01); WORK_RUN = 2; SETP_runtime = true; STEP_finish = false; break; case "040": - STEP_TIME = Convert.ToInt32(MT90); + STEP_TIME = Convert.ToInt32(MU01); WORK_RUN = 2; SETP_runtime = true; STEP_finish = false; @@ -391,7 +395,7 @@ namespace DyeingComputer.ViewModel STEP_finish = false; break; case "049": - STEP_TIME = Convert.ToInt32(MT90); + STEP_TIME = Convert.ToInt32(MU01); WORK_RUN = 2; SETP_runtime = true; STEP_finish = false; @@ -1166,6 +1170,9 @@ namespace DyeingComputer.ViewModel Updata_dtm("1006", Selet_dta("4006")); Updata_dtm("1015", Selet_dta("4007")); Updata_dtm("1016", Selet_dta("4006") * MT16); + Updata_dtm("1012", (Convert.ToDouble(Selet_dta("4003")) + MS01) / 10); + Updata_dtm("1013", (Convert.ToDouble(Selet_dta("4004")) + MS02) / 10); + Updata_dtm("1014", (Convert.ToDouble(Selet_dta("4005")) + MS03) / 10); await Task.Run(() => {