diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index bb67b49..06e432e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1203,6 +1203,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Timeout 的本地化字符串。 + /// + public static string Timeout { + get { + return ResourceManager.GetString("Timeout", resourceCulture); + } + } + /// /// 查找类似 Type 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 2e911db..7940fba 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -525,4 +525,7 @@ There is currently a running process, do you want to start a new process + + Timeout + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 753083f..95cbe17 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -525,4 +525,7 @@ RunningProcess + + Timeout + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 1952a79..53d40b7 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -525,4 +525,7 @@ 当前有运行工艺,是否开始新工艺 + + 超时 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index cf9c574..e5e1fae 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -525,4 +525,7 @@ 目前有運行工藝,是否開始新工藝 + + + \ No newline at end of file diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 9bc73d5..15139b2 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/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 {