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

ViewModel/MainWindowViewModel.cs

@@ -88,6 +88,8 @@ namespace DyeingComputer.ViewModel
 
             ProgramgroupView_run = new RelayCommand(
                 execute:ProgramgroupView_run_ );//开始/暂停事件
+            ProgramgroupView_stop = new RelayCommand(
+                execute: ProgramgroupView_stop_);//结束事件
         }
        
 
@@ -226,6 +228,30 @@ namespace DyeingComputer.ViewModel
             }
         }
         public ICommand ProgramgroupView_run { get; }
+        private void ProgramgroupView_stop_()//结束
+        {
+            APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "WORK_RUN = STOP", MainWindowViewModel.WORK_RUN.ToString());
+
+            MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show(Properties.Resources.StopProcess, "800", MessageBoxButton.OKCancel);
+            if (messageBoxResult == MessageBoxResult.OK)
+            {
+                MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
+                MainWindowViewModel.DIDETime = 0;
+                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "PROCESS_END", MainWindowViewModel.WORK_RUN.ToString());
+
+                MainWindowViewModel.dt_TP.Rows.Clear();
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                SQLiteHelpers.Delete("RUN", null, null);
+                SQLiteHelpers.Close();  //关闭连接
+
+                UserButton = false;
+                IsInteractive = false;
+                ProgramName = null;
+                WorkNumder = "----------";
+            }
+        }
+        public ICommand ProgramgroupView_stop { get; }
         bool _isInteractive;
         public bool IsInteractive//步骤表交互选择
         {