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

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;// 运行时停止键为

Properties/Resources.Designer.cs

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

Properties/Resources.en-US.resx

@@ -442,4 +442,7 @@
   <data name="FailureRecovery" xml:space="preserve">
     <value>FailureRecovery</value>
   </data>
+  <data name="StopProcess" xml:space="preserve">
+    <value>End the current process</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -438,4 +438,7 @@
   <data name="FailureRecovery" xml:space="preserve">
     <value>FailureRecovery</value>
   </data>
+  <data name="StopProcess" xml:space="preserve">
+    <value>StopProcess</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -442,4 +442,7 @@
   <data name="FailureRecovery" xml:space="preserve">
     <value>异常恢复</value>
   </data>
+  <data name="StopProcess" xml:space="preserve">
+    <value>结束当前工艺</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -438,4 +438,7 @@
   <data name="FailureRecovery" xml:space="preserve">
     <value>異常恢復</value>
   </data>
+  <data name="StopProcess" xml:space="preserve">
+    <value>結束當前製程!</value>
+  </data>
 </root>

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