diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index a9bc0cf..da9e720 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -37,9 +37,7 @@ namespace formula_manage /// public partial class MainWindow : Window { - bool quit = false; - // DataTable DissolvedataTable = new DataTable(); //建立Dissolve缓存 // DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存 // DataTable MACHINEdataTable = new DataTable(); //建立Machine缓存 @@ -113,14 +111,6 @@ namespace formula_manage row["UNIT"] = "g"; RRODUCTdataTable.Rows.Add(row); - /* for (ID_N = 2; ID_N <= 64; ID_N++) - { - row = RRODUCTdataTable.NewRow(); - row["ID"] = ID_N; - // row["STEP"] = Procedures_P.Text; - RRODUCTdataTable.Rows.Add(row); - }*/ - Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView; } @@ -226,7 +216,6 @@ namespace formula_manage wr.WriteLine(Log_time + "FORMULA_STOP"); wr.Close(); } - private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //回车跳转功能 { if (e.Key == Key.Enter) @@ -259,7 +248,6 @@ namespace formula_manage Number_Event(); //Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT); //生成料单号 } - private void Number_Event() //生成料单号事件 { int preposeL = PreposeS.Length; @@ -269,7 +257,6 @@ namespace formula_manage Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT) + str_Prepose; //生成料单号 } - private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件 { @@ -277,14 +264,12 @@ namespace formula_manage Regex re = new Regex(@"^[0-9]+(.[0-9]{1,3})?$");// 非零的正整数 e.Handled = !re.IsMatch(e.Text); } - private void Tb_KeyFloating(object sender, TextCompositionEventArgs e)//输入事件 { //Regex re = new Regex("[^0-9.-]+"); Regex re = new Regex(@"^[.][0-9]+$|^[0-9]*[.]{0,1}[0-9]*$");// 非负浮点数 e.Handled = !re.IsMatch(e.Text); } - private void logout(object sender, RoutedEventArgs e) { quit = true; @@ -293,14 +278,12 @@ namespace formula_manage window.Close(); login.ShowDialog();//实例化并置顶打开登录窗口 } - private void SQL(object sender, RoutedEventArgs e) { System.Windows.MessageBox.Show("进入数据库设置请您明确操作目的及可能需承担的后果", "警告"); Windows.Sql sql = new Windows.Sql(); sql.ShowDialog();//实例化并置顶打开数据库设置窗口 } - private void SQLBAK(object sender, RoutedEventArgs e) { MessageBoxResult sql_bak = System.Windows.MessageBox.Show("注意此功能仅作用与本地数据库(Dispensing)对于远端数据库的操作可能失败如果需要继续操作单击确定", "SQL", MessageBoxButton.OKCancel, MessageBoxImage.Exclamation); //连接失败提示 @@ -315,39 +298,32 @@ namespace formula_manage Windows.APP_set APP_set = new Windows.APP_set(); APP_set.ShowDialog();//实例化并置顶打开设置窗口 } - private void USER_SET(object sender, RoutedEventArgs e) { Windows.User user_set = new Windows.User(); user_set.ShowDialog();//实例化并置顶打开用户窗口 } - private void HELP(object sender, RoutedEventArgs e) { Help help_page = new Help(); help_page.ShowDialog();//实例化并置顶打开信息窗口 } - private void MAC_SET(object sender, RoutedEventArgs e) { Windows.Machine mac = new Windows.Machine(); mac.ShowDialog();//实例化并置顶打开设置窗口 } - private void STUFF(object sender, RoutedEventArgs e) { Windows.Stuff stuff = new Windows.Stuff(); stuff.ShowDialog();//实例化并置顶打开设置窗口 } - private void RECIPE(object sender, RoutedEventArgs e) { - } private void PROCESS(object sender, RoutedEventArgs e) { - } private void WORKFLOW(object sender, RoutedEventArgs e) @@ -358,36 +334,29 @@ namespace formula_manage private void print(object sender, RoutedEventArgs e) { - } private void fabric(object sender, RoutedEventArgs e) { - } private void variety(object sender, RoutedEventArgs e) { - } private void color(object sender, RoutedEventArgs e) { - } private void client(object sender, RoutedEventArgs e) { - } private void confirm(object sender, RoutedEventArgs e) { - } private void delete(object sender, RoutedEventArgs e) { - } private void save(object sender, RoutedEventArgs e) //保存按钮 @@ -453,7 +422,6 @@ namespace formula_manage private void DataGrid_InitializingNewItem(object sender, InitializingNewItemEventArgs e) //DetailedGrid生成行事件 { - } private void Weight(object sender, TextChangedEventArgs e) //重量输入框 @@ -492,15 +460,9 @@ namespace formula_manage PressKey.PressKeys(Keys.Right, false); PressKey.PressKeys(Keys.Right, true); - // PressKey.PressKeys(Keys.Up, false); - // PressKey.PressKeys(Keys.Up, true); PressKey.PressKeys(Keys.Tab, false); PressKey.PressKeys(Keys.Tab, true); - // System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox; - // curComboBox.SelectedIndex = -1; - - } DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true); //实时更新datagrid