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

MainWindow.xaml

@@ -169,7 +169,9 @@
                                       ItemsSource="{Binding stuff_Product, Source={StaticResource MainWindowViewModel}}"                                
                                       DisplayMemberPath="ProductCode" 
                                       Text="{Binding PRODUCT_CODE}" IsTextSearchEnabled="True" StaysOpenOnEdit="True"
-                                      BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" KeyDown="CP_PRODUCT_CODE_KeyUp">
+                                      BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True"
+                                      KeyDown="CP_PRODUCT_CODE_KeyUp"
+                                      LostFocus="CP_PRODUCT_CODE_LostFocus">
                             </ComboBox>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>

MainWindow.xaml.cs

@@ -110,6 +110,7 @@ namespace formula_manage
             DataRow row = RRODUCTdataTable.NewRow();  //ID列
             row["ID"] = ID_N;
             row["STEP"] = Procedures_P.Text;
+            row["UNIT"] = "g";
             RRODUCTdataTable.Rows.Add(row);
 
             /*    for (ID_N = 2; ID_N <= 64; ID_N++)
@@ -507,7 +508,6 @@ namespace formula_manage
 
             System.Windows.Controls.TextBox curTextBox = sender as System.Windows.Controls.TextBox;
 
-
             if (!double.TryParse(curTextBox.Text, out ang) && curTextBox.Text != "")
             {
                 System.Windows.MessageBox.Show("数值错误，重新输入");
@@ -515,7 +515,6 @@ namespace formula_manage
             }
             else
             {
-
                 if (e.Key == Key.Enter)
                 {
                     PressKey.PressKeys(Keys.Left, false);
@@ -527,17 +526,18 @@ namespace formula_manage
                     row = RRODUCTdataTable.NewRow();
                     ID_N++;
                     row["ID"] = ID_N;
+                    row["UNIT"] = "g";
                     //       row["STEP"] = Procedures_P.Text;
                     RRODUCTdataTable.Rows.Add(row);
 
-
                 }
-
-
                 DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true);   //实时更新datagrid
             }
-        }
+        } //目标饱和度输入事件
 
+        private void CP_PRODUCT_CODE_LostFocus(object sender, RoutedEventArgs e)
+        {
 
         }
     }
+}