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

View/TechnologicalProcessView.xaml.cs

@@ -201,34 +201,32 @@ namespace DyeingComputer.View
             int a = dt_TP.Rows.Count;
 
             if (ID != null) { d = Convert.ToInt16(ID); } else { return; }
-                dt_TP.Rows.RemoveAt(d - 1);
+            dt_TP.Rows.RemoveAt(d - 1);
 
-                Dat();
-                Grid.SelectedIndex = -1;
+            Dat();
+            Grid.SelectedIndex = -1;
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                SQLiteHelpers.Delete("RUN", null, null);
-                DataTable data_t = dt_TP.Clone();             
-                a = dt_TP.Rows.Count;
-                for (int i = 0; i < a; i++)
-                {
-                    data_t.Clear();//清空
+            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+            SQLiteHelpers.Open();  //打开数据库
+            SQLiteHelpers.Delete("RUN", null, null);
+            DataTable data_t = dt_TP.Clone();
+            a = dt_TP.Rows.Count;
+            for (int i = 0; i < a; i++)
+            {
+                data_t.Clear();//清空
 
-                    DataRow dt = 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();
+                DataRow dt = 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();  //关闭连接
-              //  dt_TP = sql.Tables[0];  //转换显示计划表
+                SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入                                                                                     
+            }
 
+            SQLiteHelpers.Close();  //关闭连接
         }
 
         private void ProgramgroupView_Insert_Click(object sender, RoutedEventArgs e)//插入
@@ -304,13 +302,7 @@ namespace DyeingComputer.View
             if (MainWindowViewModel.WORK_RUN == 2) Grid.SelectedIndex = MainWindowViewModel.RUN_STEPID - 1;//设定图表显示
             if (sql != null) 
             {
-                // sqlDefaultView = sql.Tables[0].DefaultView;
-                // Grid.ItemsSource = null;
-                dt_TP= sql.Tables[0];
-                //  MainWindowViewModel.TechnologicalProcess_View = MainWindowViewModel.ToObservableCollection<TechnologicalProcess>(sql.Tables[0]);
-
-                //  Grid.ItemsSource = dt_m.DE sql.Tables[0].DefaultView;  //转换显示计划表
-              //  name.Text = Program_Name;
+               dt_TP= sql.Tables[0];
             }
         }
     }