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

MainWindow.xaml

@@ -52,6 +52,7 @@
         <TextBox x:Name="Procedures_N" HorizontalAlignment="Left" Height="30" Margin="305,105,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="80" FontSize="20" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
         <Button Content="+" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,105,0,0" VerticalAlignment="Top" FontSize="10" Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_up" IsTabStop="False" Focusable ="False"/>
         <Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,120,0,0" VerticalAlignment="Top" FontSize="10" Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False"/>
+      
         <Grid Height="150" Width="405"  Margin="5,140,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top"  Background="#FFF7F7F7">
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="0,5,0,0" TextWrapping="Wrap" Text="步序:" VerticalAlignment="Top" Width="70" FontSize="20"/>
             <TextBox x:Name="Procedures_P" HorizontalAlignment="Left" Height="30" Margin="90,5,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="50" FontSize="20" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
@@ -71,8 +72,9 @@
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="220,110,0,0" TextWrapping="Wrap" Text="产品:" VerticalAlignment="Top" Width="90" FontSize="20"/>
             <ComboBox HorizontalAlignment="Left" Height="30" Margin="270,110,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" Focusable ="False" IsEditable="True"/>
         </Grid>
+       
         <DataGrid x:Name="Selectio" AlternationCount="2" IsReadOnly="False" 
-                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
+                  Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
                   BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White" SelectionMode="Single">
             <DataGrid.RowStyle >
@@ -104,7 +106,7 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="步序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" />
+                <DataGridTextColumn Header="顺序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" />
                 <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
                 <DataGridTextColumn Header="计算单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>
@@ -118,7 +120,47 @@
         <Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print" IsTabStop="False" Focusable ="False"/>
         <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
         <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
+     
         <Grid Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
+            <DataGrid x:Name="Selectio复制__C_" AlternationCount="2" IsReadOnly="False" 
+                Margin="5,0,0,0" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
+                HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
+                BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" CanUserReorderColumns="False" Background="White" SelectionMode="Single">
+                <DataGrid.RowStyle >
+                    <Style TargetType="{x:Type DataGridRow}">
+                        <Style.Triggers>
+                            <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                                <Setter Property="Background" Value="#FFFFFFFF" />
+                            </Trigger>
+                            <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                                <Setter Property="Background" Value="#FFF5F5F5" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False"/>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.RowStyle>
+                <DataGrid.CellStyle>
+                    <Style TargetType="{x:Type DataGridCell}">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="MinWidth" Value="20"/>
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="#FFC0C0C0"/>
+                                <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                                <Setter Property="Foreground" Value="#000000"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.CellStyle>
+                <DataGrid.Columns>
+                    <!--列信息绑定-->
+                    <DataGridTextColumn Header="步序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" />
+                    <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
+                </DataGrid.Columns>
+            </DataGrid>
 
 
         </Grid>

MainWindow.xaml.cs

@@ -126,20 +126,23 @@ namespace formula_manage
         private void Button_dow(object sender, RoutedEventArgs e)
         {
             int i = int.Parse(Procedures_N.Text);
+            int P = int.Parse(Procedures_P.Text);
             if (i > 1) Procedures_N.Text = (i - 1).ToString();
+            if (P >= i) Procedures_P.Text = Procedures_N.Text;
+
         }
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
             int I = int.Parse(Procedures_N.Text);
             int P = int.Parse(Procedures_P.Text);
-            if (P < I) Procedures_N.Text = (P + 1).ToString();
+            if (P < I) Procedures_P.Text = (P + 1).ToString();
         }
 
         private void Button_Click_2(object sender, RoutedEventArgs e)
         {
             int P = int.Parse(Procedures_P.Text);
-            if (P > 1) Procedures_N.Text = (P - 1).ToString();
+            if (P > 1) Procedures_P.Text = (P - 1).ToString();
         }
     }
 }