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

MainWindow.xaml

@@ -76,7 +76,7 @@
             <Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="140,20,0,0" VerticalAlignment="Top" FontSize="10" 
                     Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" IsTabStop="False" Click="Button_StepDow" Focusable ="False"/>
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="170,5,0,0" TextWrapping="Wrap" Text="流程:" VerticalAlignment="Top" Width="70" FontSize="20"/>
-            <ComboBox HorizontalAlignment="Left" Height="30" Margin="220,5,0,0" Text="" VerticalAlignment="Top" Width="180" FontSize="20" IsTabStop="False" IsEditable="True"/>
+            <ComboBox HorizontalAlignment="Left" Height="30" Margin="220,5,0,0" Text="" VerticalAlignment="Top" Width="180" FontSize="20" IsEditable="True"/>
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="0,40,0,0" TextWrapping="Wrap" Text="配方代码:" VerticalAlignment="Top" Width="90" FontSize="20"/>
             <TextBox HorizontalAlignment="Left" Height="30" Margin="90,40,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="125" FontSize="20" KeyUp="SearchBox_OnKeyDownd"/>
             <TextBox HorizontalAlignment="Left" Height="30" Margin="220,40,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="145" FontSize="20" Focusable ="False"/>
@@ -138,22 +138,22 @@
             
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" IsReadOnly="True" Binding="{Binding ID}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" IsReadOnly="True" Binding="{Binding ID}" CellStyle="{StaticResource CellStyle}"/>
-                <DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" >
+                <DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0" Text="{Binding PRODUCT_CODE}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True"/>
+                            <ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0" Text="{Binding PRODUCT_CODE}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" KeyUp="CP_PRODUCT_CODE_KeyUp"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="目标饱和度(%)" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" >
+                <DataGridTemplateColumn Header="目标饱和度(%)" Width="200" MaxWidth="400" MinWidth="100">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBox x:Name="CP_CONC" BorderThickness="0,0,0,0" Text="{Binding CONC}" BorderBrush="{x:Null}" Background="{x:Null}"/>
+                            <TextBox x:Name="CP_CONC" BorderThickness="0,0,0,0" Text="{Binding CONC}" BorderBrush="{x:Null}" Background="{x:Null}" KeyUp="CP_CONC_KeyUp"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CanUserReorder="False" CellStyle="{StaticResource CellStyle}">
+                <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CellStyle="{StaticResource CellStyle}">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False">
@@ -163,16 +163,16 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="原料名称" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" CellStyle="{StaticResource CellStyle}">
+                <DataGridTemplateColumn Header="原料名称" Width="200" MaxWidth="400" MinWidth="100" CellStyle="{StaticResource CellStyle}">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <ComboBox x:Name="CP_PRODUCT_NAME" BorderThickness="0,0,0,0" Text="{Binding PRODUCT_NAME}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
-                <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
-                <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
             </DataGrid.Columns>
         </DataGrid>
         

MainWindow.xaml.cs

@@ -263,5 +263,22 @@ namespace formula_manage
             }
         }
 
+        private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            
+
+
+                if (e.Key == Key.Enter)
+                {
+                    //SendKeys.SendWait("{Tab}");
+                    UserClass.PressKey.PressKeys(Keys.Tab, false);
+                    UserClass.PressKey.PressKeys(Keys.Tab, true);
+                } 
+        }
+
+        private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+
+        }
     }
 }