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

ViewModel/MainWindowViewModel.cs

@@ -380,6 +380,16 @@ namespace DyeingComputer.ViewModel
             {
                 ERRinf.ERRinf_d(errTabler, "ERR101");
             }
+
+            if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))//布轮1检测超时
+            {
+                if (Selet_dtm("1030") > 999)
+                {
+                    ERRinf.ERRinf_w(errTabler, Resources.ClothWheel+ "1 :"+ Resources.Timeout , "ERE110-1");
+                }
+                else { ERRinf.ERRinf_d(errTabler, "ERE110-1"); }
+            }
+
         }
         void DisTimer_500MS(object sender, EventArgs e)//Tick_Event周期执行事件200MS
         {