修改操作页面开始添加从逻辑

View/TechnologicalProcessView.xaml

@@ -9,7 +9,6 @@
              xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
              d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
              mc:Ignorable="d" Loaded="UserControl_Loaded"
-             KeyDown="UserControl_KeyDown"
              d:DesignHeight="630" d:DesignWidth="1280">
     <UserControl.Resources>
         <ConvertMoels:StatenConvert x:Key="StatenConvert"/>

View/TechnologicalProcessView.xaml.cs

@@ -325,34 +325,15 @@ namespace DyeingComputer.View
             // FocusManager.SetFocusedElement(Grid, Grid);
             // Grid.DataContext = new MainWindowViewModel();
         }
-        private void UserControl_KeyDown(object sender, KeyEventArgs e) //键盘监控
-        {
-            if (MainWindowViewModel.errTabler.Rows.Count == 0)//无错误信息
-            {
-                if ((MainWindowViewModel.WORK_RUN == 1) || (MainWindowViewModel.WORK_RUN == 0))//停止暂停时可以启用开始
-                {
-                    if (e.Key == Key.Y) //按键y
-                    {
-                        if (string.IsNullOrEmpty(Numder))
-                        {
-                            MainWindowViewModel.WORK_RUN = 2;
-                        }
-                        else
-                        {
-                          //  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));
-                        }
-                    }
-                }
-            }
-        }
+     
         private void ProgramgroupView_edit_Click(object sender, RoutedEventArgs e)//编辑按钮
         {
             if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
             if (ID == null) ID = sql.Tables[0].Rows.Count.ToString();
             APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Edit", "STEP = " + ID);
             ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+            viewstop.boxNAME.IsEnabled=false;
+            viewstop.no.IsEnabled = false;
             viewstop.data = ID;
             viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
             viewstop.ShowDialog();
@@ -380,9 +361,7 @@ namespace DyeingComputer.View
             }
             else
             {
-                MainWindowViewModel.dt_TP.Rows.RemoveAt(n - 1);
-                Dat();
-                GridSTEP.SelectedIndex = -1;
+                return;
             }
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库
@@ -469,10 +448,61 @@ namespace DyeingComputer.View
             if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
             if (ID == null) ID = MainWindowViewModel.dt_TP.Rows.Count.ToString();
             ViewStep viewstop = new ViewStep(null, "0", "0", "0", "0", "0");
+            viewstop.boxNAME.IsEnabled = false;
+            viewstop.no.IsEnabled = false;
             viewstop.data = ID;
-            viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
+            viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_InsertClicked);
             viewstop.ShowDialog();
         }
+        private void Address_InsertClicked(object sender, AddressUpdateEventArgs e)//插入返回结果
+        {
+            int n = Convert.ToInt16(ID);
+            ID = null;
+            if (e.PNAME != "")
+            {
+                DataRow dr = sql.Tables[0].Rows[n - 1];
+                dr.BeginEdit();
+                dr["StepID"] = e.StepID;
+                dr["StepName"] = e.StepNAME;
+                dr["ParameterName"] = e.PNAME;
+                dr["Parameter1"] = e.P1;
+                dr["Parameter2"] = e.P2;
+                dr["Parameter3"] = e.P3;
+                dr["Parameter4"] = e.P4;
+                dr["Parameter5"] = e.P5;
+                dr.EndEdit();
+
+                MainWindowViewModel.dt_TP = sql.Tables[0];
+                GridSTEP.SelectedIndex = -1;
+            }
+            else
+            {
+                MainWindowViewModel.dt_TP.Rows.RemoveAt(n - 1);
+                Dat();
+                GridSTEP.SelectedIndex = -1;
+            }
+            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+            SQLiteHelpers.Open();  //打开数据库
+            SQLiteHelpers.Delete("RUN", null, null);
+            DataTable data_t = MainWindowViewModel.dt_TP.Clone();
+            for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++)
+            {
+                data_t.Clear();//清空
+                DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换
+                DataRow drT = data_t.NewRow();
+                drT.ItemArray = dt.ItemArray;
+                data_t.Rows.InsertAt(drT, 0);
+                drT.BeginEdit(); //添加订单号
+                drT["DYELOT"] = MainWindowViewModel.WorkNumder;
+                drT.EndEdit();
+                SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入                                                                                     
+            }
+            SQLiteHelpers.Close();  //关闭连接
+            APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "STEP = " + n,
+                "StepID=" + e.StepID + ";StepName=" + e.StepNAME + ";P1=" + e.P1 +
+                ";P2=" + e.P2 + ";P3=" + e.P3 + ";P4=" + e.P4 + ";P5=" + e.P5);
+            MainWindowViewModel.User_Button = true;
+        }
         private void ProgramgroupView_Jump_Click(object sender, RoutedEventArgs e)
         {
             int n = Convert.ToInt16(ID);