diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 15139b2..faa6393 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -381,15 +381,103 @@ namespace DyeingComputer.ViewModel ERRinf.ERRinf_d(errTabler, "ERR101"); } - if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))//布轮1检测超时 + if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022"))) { - if (Selet_dtm("1030") > 999) + if (Selet_dtm("1030") == 0 ) { ERRinf.ERRinf_w(errTabler, Resources.ClothWheel+ "1 :"+ Resources.Timeout , "ERE110-1"); } else { ERRinf.ERRinf_d(errTabler, "ERE110-1"); } - } + }//布轮1检测超时 + if ((Selet_dtm("1026") > 0) && (Selet_dtd("3023") || Selet_dtd("3024"))) + { + if (Selet_dtm("1031") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "2 :" + Resources.Timeout, "ERE110-2"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-2"); } + }//布轮2检测超时 + if ((Selet_dtm("1027") > 0) && (Selet_dtd("3025") || Selet_dtd("3026"))) + { + if (Selet_dtm("1032") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "3 :" + Resources.Timeout, "ERE110-3"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-3"); } + }//布轮3检测超时 + if ((Selet_dtm("1028") > 0) && (Selet_dtd("3027") || Selet_dtd("3028"))) + { + if (Selet_dtm("1033") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "4 :" + Resources.Timeout, "ERE110-4"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-4"); } + }//布轮4检测超时 + if ((Selet_dtm("1029") > 0) && (Selet_dtd("3029") || Selet_dtd("3030"))) + { + if (Selet_dtm("1034") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "5 :" + Resources.Timeout, "ERE110-5"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-5"); } + }//布轮5检测超时 + if ((Selet_dtm("1035") > 0) && (Selet_dtd("3031") || Selet_dtd("3022"))) + { + if (Selet_dtm("1036") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "6 :" + Resources.Timeout, "ERE110-6"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-6"); } + }//布轮6检测超时 + if ((Selet_dtm("1037") > 0) && (Selet_dtd("3033") || Selet_dtd("3034"))) + { + if (Selet_dtm("1038") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "7 :" + Resources.Timeout, "ERE110-7"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-7"); } + }//布轮7检测超时 + if ((Selet_dtm("1039") > 0) && (Selet_dtd("3065") || Selet_dtd("3066"))) + { + if (Selet_dtm("1040") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "8 :" + Resources.Timeout, "ERE110-8"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-8"); } + }//布轮8检测超时 + if ((Selet_dtm("1051") > 0) && (Selet_dtd("3067") || Selet_dtd("3068"))) + { + if (Selet_dtm("1052") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "9 :" + Resources.Timeout, "ERE110-9"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-9"); } + }//布轮9检测超时 + if ((Selet_dtm("1053") > 0) && (Selet_dtd("3069") || Selet_dtd("3070"))) + { + if (Selet_dtm("1054") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "10 :" + Resources.Timeout, "ERE110-10"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-10"); } + }//布轮10检测超时 + if ((Selet_dtm("1055") > 0) && (Selet_dtd("3071") || Selet_dtd("3072"))) + { + if (Selet_dtm("1056") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "11 :" + Resources.Timeout, "ERE110-11"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-11"); } + }//布轮11检测超时 + if ((Selet_dtm("1057") > 0) && (Selet_dtd("3073") || Selet_dtd("3074"))) + { + if (Selet_dtm("1058") == 0) + { + ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "12 :" + Resources.Timeout, "ERE110-12"); + } + else { ERRinf.ERRinf_d(errTabler, "ERE110-12"); } + }//布轮12检测超时 } void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件200MS { @@ -1652,10 +1740,10 @@ namespace DyeingComputer.ViewModel if (MT18 >= 6) SYSlog = SYSlog + " | " + "6 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1035"))); if (MT18 >= 7) SYSlog = SYSlog + "\n" + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1037"))); 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("1053"))); - if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1055"))); - if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1057"))); - if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1059"))); + if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1051"))); + if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1053"))); + if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1055"))); + if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1057"))); SYSlog = SYSlog + "\n" + Resources.Cycletime + "Sec"; SYSlog = SYSlog + "\n" + "1 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))); if (MT18 >= 2) SYSlog = SYSlog + " | " + "2 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1031"))); @@ -1665,10 +1753,10 @@ namespace DyeingComputer.ViewModel if (MT18 >= 6) SYSlog = SYSlog + " | " + "6 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1036"))); if (MT18 >= 7) SYSlog = SYSlog + "\n" + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1038"))); if (MT18 >= 8) SYSlog = SYSlog + " | " + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1040"))); - if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1054"))); - if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1056"))); - if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1058"))); - if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1060"))); + if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1052"))); + if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1054"))); + if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1056"))); + if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1058"))); }//布轮信息 SYSlog = SYSlog + "\n-------------------------------------------------------";