diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml index 7011ddb..3815ef8 100644 --- a/View/WorkOrderView.xaml +++ b/View/WorkOrderView.xaml @@ -61,14 +61,14 @@ - + - + diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index 7dcea9f..9dd196d 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -55,7 +55,7 @@ namespace DyeingComputer.View if (sql != null) sql.Clear(); //清空缓存 sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存 - if(sql!=null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 + if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 SQLiteHelpers.Close(); //关闭连接 @@ -82,7 +82,7 @@ namespace DyeingComputer.View // WpfPlot_Grid.Plot.YLabel("Temperature (C)"); - + } private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮 @@ -94,28 +94,29 @@ namespace DyeingComputer.View if (_lock == "0") //改变lock的状态 { - lock_v.Add("lock", 1); - SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='"+WorkOrder_Numder+"'",null); - }else + lock_v.Add("lock", 1); + SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null); + } + else { lock_v.Add("lock", 0); SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null); } - SQLiteHelpers.Close(); + SQLiteHelpers.Close(); Workorder_sql(); } private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮 { - + } private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮 { if (WorkOrder_Numder == null) return; ///弹窗提示确认删除 - if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder , "Delete ", + if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder, "Delete ", System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK) { ///执行删除 @@ -130,13 +131,13 @@ namespace DyeingComputer.View private void WorkOrderView_redy_Click(object sender, RoutedEventArgs e)//重染按钮 { string WorkNum = MainWindowViewModel.WorkNumder.ToString(); - if (WorkNum !=null) + if (WorkNum != null) { if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Redye + WorkNum, "Redye ", System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK) { ///执行重染 - } + } } } @@ -151,5 +152,7 @@ namespace DyeingComputer.View _lock = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列, } } + + } }