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

View/TechnologicalProcessView.xaml.cs

@@ -302,12 +302,6 @@ namespace DyeingComputer.View
 
             // if (sql != null)
             MainWindowViewModel.dt_TP = sql.Tables[0];  //转换显示计划表
-           
-
-                 DataRow newRow;
-            newRow = MainWindowViewModel.dt_TP.NewRow();
-            newRow["StepName"] = "END";
-            MainWindowViewModel.dt_TP.Rows.Add(newRow);
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
@@ -504,17 +498,7 @@ namespace DyeingComputer.View
 
         private void ProgramgroupView_run_Click(object sender, RoutedEventArgs e)//运行/暂停
         {
-            if (MainWindowViewModel.WORK_RUN == 2)
+         
-            {
-                MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停
-                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "WORK_RUN = Pause", MainWindowViewModel.WORK_RUN.ToString());
-            }
-            else
-            {
-                MainWindowViewModel.WORK_RUN = 2;// 运行时停止键为
-                APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "WORK_RUN = RUN", MainWindowViewModel.WORK_RUN.ToString());
-
-            }
         }
 
         private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e)
@@ -540,6 +524,10 @@ namespace DyeingComputer.View
                 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();  //关闭连接
                 ProgramgroupView_stop.IsEnabled = false;
                 ProgramgroupView_Insert.IsEnabled = false;
                 ProgramgroupView_del.IsEnabled = false;

ViewModel/MainWindowViewModel.cs

@@ -207,12 +207,17 @@ namespace DyeingComputer.ViewModel
             {
                 UserButton = true;
                 IsInteractive = true;
+                WORK_RUN = 1;// 运行时停止键为暂停
+                APILog.LOGlog(WorkNumder.ToString(), "UserActions", "WORK_RUN = Pause", WORK_RUN.ToString());
             }
             else 
             if (WORK_RUN == 1)
             {
                 UserButton = false;
                 IsInteractive = false;
+                WORK_RUN = 2;// 运行时停止键为
+                APILog.LOGlog(WorkNumder.ToString(), "UserActions", "WORK_RUN = RUN", WORK_RUN.ToString());
+
             }
             else
             {