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

Login.xaml

@@ -21,9 +21,9 @@
         <Button x:Name="logon" Content="登录" HorizontalAlignment="Left" Height="33" Margin="40,264,0,0" VerticalAlignment="Top" Width="64" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
         <Button Content="退出" HorizontalAlignment="Right" Height="33" Margin="140,264,40,0" VerticalAlignment="Top" Width="64" Click="Button_Click" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
         <TextBlock Height="30" Margin="15,115,15,0" TextWrapping="Wrap" Text="尚彩科技单据管理系统" VerticalAlignment="Top" FontSize="20"/>
-        <TextBox x:Name="DISPENLINK" HorizontalAlignment="Left" Height="15" Margin="0,0,0,0" TextWrapping="Wrap" Text="DISPEN" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
-        <TextBox x:Name="DBCLINK" HorizontalAlignment="Left" Height="15" Margin="50,0,0,0" TextWrapping="Wrap" Text="DBC" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
-        <TextBox x:Name="EXLINK" HorizontalAlignment="Left" Height="15" Margin="100,0,0,0" TextWrapping="Wrap" Text="EX" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
-        <TextBox x:Name="USERLINK" HorizontalAlignment="Left" Height="15" Margin="150,0,0,0" TextWrapping="Wrap" Text="USER" VerticalAlignment="Bottom" Width="98" Background="#FFF1F1F1" BorderBrush="#FF989898"/>
+        <TextBox x:Name="DISPENLINK" HorizontalAlignment="Left" Height="15" Margin="0,0,0,0" TextWrapping="Wrap" Text="DISPEN" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898" Focusable="False" MaxLines="1" FontSize="11"/>
+        <TextBox x:Name="DBCLINK" HorizontalAlignment="Left" Height="15" Margin="50,0,0,0" TextWrapping="Wrap" Text="DBC" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898" FontSize="11" MaxLines="1"/>
+        <TextBox x:Name="EXLINK" HorizontalAlignment="Left" Height="15" Margin="100,0,0,0" TextWrapping="Wrap" Text="EX" VerticalAlignment="Bottom" Width="50" Background="#FFF1F1F1" BorderBrush="#FF989898" FontSize="11" MaxLines="1"/>
+        <TextBox x:Name="USERLINK" HorizontalAlignment="Left" Height="15" Margin="150,0,0,0" TextWrapping="Wrap" Text="USER" VerticalAlignment="Bottom" Width="98" Background="#FFF1F1F1" BorderBrush="#FF989898" MaxLines="1" FontSize="11"/>
     </Grid>
 </Window>

MainWindow.xaml

@@ -167,7 +167,7 @@
                         <DataTemplate>
                             <ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0"                                                  
                                       ItemsSource="{Binding stuff_Product, Source={StaticResource MainWindowViewModel}}"                                
-                                      DisplayMemberPath="ProductCode"                                    
+                                      DisplayMemberPath="ProductCode" 
                                       Text="{Binding PRODUCT_CODE}" IsTextSearchEnabled="True" StaysOpenOnEdit="True"
                                       BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" KeyDown="CP_PRODUCT_CODE_KeyUp">
                             </ComboBox>

MainWindow.xaml.cs

@@ -28,6 +28,7 @@ using System.Windows.Threading;
 using formula_manage.ViewModel;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using static System.Net.Mime.MediaTypeNames;
+using formula_manage.UserClass;
 //using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 
@@ -486,6 +487,13 @@ namespace formula_manage
                 UserClass.PressKey.PressKeys(Keys.Up, true);
                 UserClass.PressKey.PressKeys(Keys.Tab, false);
                 UserClass.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
+
+                    
             }
         }
 
@@ -497,7 +505,12 @@ namespace formula_manage
                 UserClass.PressKey.PressKeys(Keys.Left, true);
                 UserClass.PressKey.PressKeys(Keys.Tab, false);
                 UserClass.PressKey.PressKeys(Keys.Tab, true);
+
+            
             }
+
         }
+
+        
     }
 }