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

Properties/Resources.Designer.cs

@@ -1203,6 +1203,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Timeout 的本地化字符串。
+        /// </summary>
+        public static string Timeout {
+            get {
+                return ResourceManager.GetString("Timeout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Type 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -525,4 +525,7 @@
   <data name="RunningProcess" xml:space="preserve">
     <value>There is currently a running process, do you want to start a new process</value>
   </data>
+  <data name="Timeout" xml:space="preserve">
+    <value>Timeout</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -525,4 +525,7 @@
   <data name="RunningProcess" xml:space="preserve">
     <value>RunningProcess</value>
   </data>
+  <data name="Timeout" xml:space="preserve">
+    <value>Timeout</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -525,4 +525,7 @@
   <data name="RunningProcess" xml:space="preserve">
     <value>当前有运行工艺，是否开始新工艺</value>
   </data>
+  <data name="Timeout" xml:space="preserve">
+    <value>超时</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -525,4 +525,7 @@
   <data name="RunningProcess" xml:space="preserve">
     <value>目前有運行工藝，是否開始新工藝</value>
   </data>
+  <data name="Timeout" xml:space="preserve">
+    <value />
+  </data>
 </root>

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
         {