diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml index 76caaf7..6c1bd1d 100644 --- a/View/TechnologicalProcessView.xaml +++ b/View/TechnologicalProcessView.xaml @@ -31,6 +31,15 @@ + + + + + + + + + diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 3abfd2a..7f8d99a 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -126,10 +126,14 @@ namespace DyeingComputer.ViewModel public static int SM01;//副缸 public static int SM02;//副缸 public static int SM03;//副缸 + public int MI01;// + public int MI02;// + public int MI03;// private double MS01;//1缸温度偏差 private double MS02;//2缸温度偏差 private double MS03;//3缸温度偏差 + public int MS17;//副缸 public int MS18;//副缸 public int MS19;//副缸 @@ -170,7 +174,11 @@ namespace DyeingComputer.ViewModel S03 = Selet_sys("S03");// S05 = Selet_sys("S05");// S06 = Selet_sys("S06");// + MI01 = Convert.ToInt16(Selet_sys("MI01"));//工作信息 + MI02 = Convert.ToInt16(Selet_sys("MI02"));//工作信息 + MI03 = Convert.ToInt16(Selet_sys("MI03"));//工作信息 S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息 + SM01 = Convert.ToInt16(Selet_sys("SM01"));//FG SM02 = Convert.ToInt16(Selet_sys("SM02"));//FG SM03 = Convert.ToInt16(Selet_sys("SM03"));//FG @@ -1511,15 +1519,19 @@ namespace DyeingComputer.ViewModel { SYSlog = SYSlog + "\n" + Resources.PumpSpeed + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStops + "]";//主泵状态 } - SYSlog = SYSlog + "\n" + Resources.MasterCylinder + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1042"))) + "Bar"; - SYSlog = SYSlog + " | " + Resources.Nozzle + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1043"))) + "Bar"; SYSlog = SYSlog + "\n-------------------------------------------------------"; - SYSlog = SYSlog + "\n" + Resources.DifferentialPressure + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1044"))) + "%"; + if (MI03 == 1) + { + SYSlog = SYSlog + "\n" + Resources.MasterCylinder + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1042"))) + "Bar"; + SYSlog = SYSlog + " | " + Resources.Nozzle + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1043"))) + "Bar"; + SYSlog = SYSlog + "\n" + Resources.DifferentialPressure + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1044"))) + "%"; + } //压力 SYSlog = SYSlog + "\n" + Resources.Blower + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1021"))) + "%"; // SYSlog = SYSlog + "\n" + Resources.GuidingWheel + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1046"))) + "M/min"; - SYSlog = SYSlog + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1045"))) + "L/min"; - - SYSlog = SYSlog + "\n" + Resources.ClothWheel + "M/min"; + if (MI02 == 2) SYSlog = SYSlog + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1045"))) + "L/min";//喷射流量 + if (MI01 == 1)// + { + SYSlog = SYSlog + "\n" + Resources.ClothWheel + "M/min"; SYSlog = SYSlog + "\n" + "1 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1022"))); if (MT18 >= 2) SYSlog = SYSlog + " | " + "2 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1023"))); if (MT18 >= 3) SYSlog = SYSlog + " | " + "3 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1024"))); @@ -1541,7 +1553,7 @@ namespace DyeingComputer.ViewModel if (MT18 >= 8) SYSlog = SYSlog + " | " + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1039"))); if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1040"))); if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1041"))); - + }//布轮信息 SYSlog = SYSlog + "\n-------------------------------------------------------"; if (SM01 == 1) @@ -1907,6 +1919,7 @@ namespace DyeingComputer.ViewModel } public class TechnologicalProcess { + public int RUN { get; set; } public string ProgramID { get; set; } public string Program { get; set; } public double Step { get; set; }