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

View/TechnologicalProcessView.xaml.cs

@@ -96,6 +96,8 @@ namespace DyeingComputer.View
                 TechnologicalProcess_sql();
               //  Grid.SelectedIndex = Convert.ToInt16(MainWindowViewModel.Process_step);
             }
+
+            if(MainWindowViewModel.WORK_RUN !=0)Grid.SelectedIndex = MainWindowViewModel.RUN_STEPID-1;//设定图表显示
         }
 
         private void UserControl_KeyDown(object sender, KeyEventArgs e) //键盘监控
@@ -106,6 +108,8 @@ namespace DyeingComputer.View
                 {
                     if (e.Key == Key.Y) //按键y
                     {
+                        MainWindowViewModel.RUN_DATATABLE = sql.Tables[0];//缓存表
+                        MainWindowViewModel.RUN_STEPID = Convert.ToInt16(ID);//插入步骤号
                         MainWindowViewModel.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));                                         
                     }
                 }