diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 7858fcd..856358f 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -644,7 +644,7 @@ namespace formula_manage double Weight_=0; private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//原料代码输入事件 - { + { double ang; if (e.Key == Key.Enter) { @@ -652,7 +652,7 @@ namespace formula_manage int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行 if (grid_row == -1) grid_row = 0; - Code_ = curComboBox.Text; + Code_ = curComboBox.Text.TrimEnd(); if (Code_ == "") { if (Procedures_N.Text == Procedures_P.Text) @@ -754,6 +754,8 @@ namespace formula_manage Confirm.IsEnabled = false; DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true); //实时更新datagrid } + + list_Weight.Text = list_Weight.Text.TrimEnd();//清楚输入字符空格 } private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//目标饱和度输入事件 { @@ -819,7 +821,7 @@ namespace formula_manage System.Windows.Controls.ComboBox curComboBox = sender as System.Windows.Controls.ComboBox; int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行 - Code_ = curComboBox.Text; + Code_ = curComboBox.Text.TrimEnd(); if (Code_ == "") { if (Procedures_N.Text == Procedures_P.Text) @@ -915,7 +917,7 @@ namespace formula_manage if (curComboBox.Text != "") { - Name_ = curComboBox.Text; + Name_ = curComboBox.Text.TrimEnd(); DataRow[] r = MainWindowViewModel.STUFFdatatemp.Select("ProductName ='" + Name_ + "'"); //查询判断原料代码是否有效