diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index 9348326..8f924d6 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -132,10 +132,6 @@ namespace DyeingComputer.View MainWindowViewModel.WorkNumder = DateTime.Now.ToString("yyMMddHHmmss"); TechnologicalProcessView.workName = e.ID; - - - - } private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮 { @@ -237,7 +233,7 @@ namespace DyeingComputer.View } } - private void start_Click(object sender, RoutedEventArgs e) + private void start_Click(object sender, RoutedEventArgs e)//开始 { DataTable WorkorderSteps = new DataTable(); DataTable data_t = new DataTable(); @@ -287,7 +283,7 @@ namespace DyeingComputer.View SQLiteHelpers.Close(); //关闭连接 - if (Process_id != null) //选定工艺有效跳转准备 + /* if (Process_id != null) //选定工艺有效跳转准备 { MainWindowViewModel.WorkNumder = WorkOrder_Numder; TechnologicalProcessView.workName = Process_id; @@ -296,12 +292,35 @@ namespace DyeingComputer.View MainWindowViewModel.ViewID = 1; var _mainWindow = Application.Current.Windows.Cast().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面 _mainWindow.container.Content = new TechnologicalProcessView();//获取控件 - } + }*/ } private void inf_Click(object sender, RoutedEventArgs e) { if (string.IsNullOrEmpty(WorkOrder_Numder)) return; + DataGrid dataGrid = new DataGrid(); + dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Step, Width = 60, Binding = new Binding("Step") }); + dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Directives, Width = 300, Binding = new Binding("StepName") }); + dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.ParameterSet, Width =500, Binding = new Binding("ParameterName") }); + dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Remark, Width = 600, Binding = new Binding("Remark") }); + dataGrid.AutoGenerateColumns = false; + dataGrid.CanUserReorderColumns = false; + dataGrid.CanUserSortColumns = false; + dataGrid.CanUserResizeRows = false; + dataGrid.CanUserResizeColumns = false; + dataGrid.ColumnHeaderHeight = 40; + dataGrid.FontSize = 25; + dataGrid.HorizontalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); + dataGrid.VerticalGridLinesBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 201, 201, 201)); + + SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + SQLiteHelpers.Open(); //打开数据库 + string sql_script = "select * from WorkorderSteps where WorkOrder='"+ WorkOrder_Numder+"'"; + DataTable inf = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0]; //读取表写入缓存 + SQLiteHelpers.Close(); //关闭连接 + dataGrid.ItemsSource = inf.DefaultView; //转换显示计划表 + + Picture.Content = dataGrid; }