Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

MainWindow.xaml

@@ -92,7 +92,7 @@
             <TextBox HorizontalAlignment="Left" Height="30" Margin="270,110,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" Focusable ="False"/>
         </Grid>
 
-        <DataGrid x:Name="DetailedGrid" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
+        <DataGrid x:Name="Grid_RRODUCT" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
                   Margin="5,325,5,80" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
                   BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"

MainWindow.xaml.cs

@@ -17,6 +17,8 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using static System.Net.Mime.MediaTypeNames;
 //using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace formula_manage
@@ -57,7 +59,7 @@ namespace formula_manage
                 dataTable.Rows.Add(row);
             }
             // DetailedGrid.DataContext = dataTable;
-            DetailedGrid.ItemsSource = dataTable.DefaultView;
+            Grid_RRODUCT.ItemsSource = dataTable.DefaultView;
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)     //窗口关闭事件
@@ -266,14 +268,44 @@ namespace formula_manage
         private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
         {
            
+                string PRODUCTCODE = null;
+                int rownum = Grid_RRODUCT.SelectedIndex;
+               // string PRODUCTCODE = (Grid_RRODUCT.Columns[2].GetCellContent(Grid_RRODUCT.Items[rownum]) as System.Windows.Controls.ComboBox).Text;
+          
+            //string PRODUCTCODE = DetailedGrid.//DataGridTemplateColumn.CellTemplateProperty.ToString(); //(DetailedGrid.CurrentCell.ToString() as DataGridTemplateColumn);  //DataGridComboBoxColumn).TextBinding; //DetailedGrid.CurrentCell..ToString();
 
 
+               DataGridTemplateColumn PRODUCTCODE_tempColumn = this.Grid_RRODUCT.Columns.Where(r => r.Header.Equals("原料代码")).FirstOrDefault() as DataGridTemplateColumn;
+               FrameworkElement PRODUCTCODE_element = PRODUCTCODE_tempColumn.GetCellContent(Grid_RRODUCT.Items[rownum-1]);
+
+               if (PRODUCTCODE_element != null)//构件类型
+                {
+                   //把单元格元素转换为相应的控件，再从该控件中取值
+              // System.Windows.Controls.ComboBox
+                    PRODUCTCODE = (PRODUCTCODE_tempColumn.CellTemplate.FindName("CP_PRODUCT_CODE", PRODUCTCODE_element) as System.Windows.Controls.ComboBox).Text;
+               }
+          //  string specs = Grid_RRODUCT.SelectedCells[1].Column.GetCellContent(Grid_RRODUCT.SelectedItem) as TextBlock).Text; // return null
+          //  imgPopup.Source = dgridTenderInventory.SelectedCells[1].Column.GetCellContent(item) as Image).Source; // ?? how does it be implemented?
+
+         /*   if (PRODUCTCODE == null)
+            {
                 if (e.Key == Key.Enter)
                 {
-                    //SendKeys.SendWait("{Tab}");
+                    UserClass.PressKey.PressKeys(Keys.Right, false);
+                    UserClass.PressKey.PressKeys(Keys.Right, true);
                     UserClass.PressKey.PressKeys(Keys.Tab, false);
                     UserClass.PressKey.PressKeys(Keys.Tab, true);
                 }
+            
+            }
+            else
+            {
+                if (e.Key == Key.Enter)
+                {
+                    UserClass.PressKey.PressKeys(Keys.Tab, false);
+                    UserClass.PressKey.PressKeys(Keys.Tab, true);
+                }
+            }           */
         }
 
         private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)