diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ba5a4f8..d89f699 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -166,7 +166,7 @@ namespace DyeingComputer
MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停
}else if (MainWindowViewModel.WORK_RUN == 1)
{
- MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show("800", Properties.Resources.Save, MessageBoxButton.OKCancel);
+ MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show(Properties.Resources.StopProcess, "800", MessageBoxButton.OKCancel);
if (messageBoxResult == MessageBoxResult.OK)
{
MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 5691b15..1bf14c2 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -888,6 +888,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 StopProcess 的本地化字符串。
+ ///
+ public static string StopProcess {
+ get {
+ return ResourceManager.GetString("StopProcess", resourceCulture);
+ }
+ }
+
///
/// 查找类似 SystemDataLoss 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 9c7fd38..59f57a4 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -442,4 +442,7 @@
FailureRecovery
+
+ End the current process
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 5eeba91..5625e01 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -438,4 +438,7 @@
FailureRecovery
+
+ StopProcess
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 0ebd378..ee0f2d4 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -442,4 +442,7 @@
异常恢复
+
+ 结束当前工艺
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index f8059d6..cebfb9f 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -438,4 +438,7 @@
異常恢復
+
+ 結束當前製程!
+
\ No newline at end of file
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index 7bb4341..26e72b8 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -315,43 +315,43 @@ namespace DyeingComputer.ViewModel
break;
case "050":
- break;
+ break;//主缸加压
case "051":
- break;
+ break;//主缸减压
case "054":
- break;
+ break;//主泵/风机速度
case "055":
- break;
+ break;//主泵启动
case "056":
- break;
+ break;//主泵停止
case "064":
- break;
+ break;//药缸备药
case "065":
- break;
+ break;//药缸加药
case "066":
- break;
+ break;//呼叫输送
case "067":
- break;
+ break;//呼叫输送
case "090":
- break;
+ break;//快速加酸
case "091":
- break;
+ break;//PH温度控制
case "093":
- break;
+ break;//PH检测
case "094":
- break;
+ break;//PH控制
default:
break;
}
@@ -784,6 +784,10 @@ namespace DyeingComputer.ViewModel
}
else if (WORK_RUN == 1)
{
+ for (ushort i = 0; i < 100; i++) { updata_dtd((i + 3011).ToString(), false); }
+
+ SETP_runtime = false;
+ STEP_finish = false;
Status_Str = Resources.Paused;
}
else