From 160fd104aee8862619eaa0f4064d587743ddff2e Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 7 Nov 2023 16:39:00 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E6=88=90=E5=93=81=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StatisticsPageView.xaml             | 39 ++++++++++++++++---
 .../Views/StatisticsPageView.xaml.cs          | 16 ++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
index 2114b55b..bd75bafe 100644
--- a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
@@ -11,7 +11,7 @@
 
     <UserControl.Resources>
         <cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
-        
+
         <!--列头标题栏样式-->
         <Style TargetType="DataGridColumnHeader">
             <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -23,9 +23,8 @@
             <Setter Property="Height" Value="30"/>
             <Setter Property="FontSize" Value="14"/>
         </Style>
-        
-    </UserControl.Resources>
 
+    </UserControl.Resources>
     <Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
         <Grid>
             <Grid.RowDefinitions>
@@ -36,8 +35,9 @@
             <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
                 <TextBlock Text="扫描记录" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
             </Border>
-            
-            <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,50,5,5">
+            <Button x:Name="btn1" Content="入库记录" HorizontalAlignment="Left" Margin="37,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF1752E1" Click="btn1_Click" />
+            <Button x:Name="btn2" Content="入库统计" HorizontalAlignment="Left" Margin="135,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" Click="btn2_Click" />
+            <Border x:Name="border1" Grid.Row="1" Visibility="Visible" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,50,5,5">
                 <Grid Margin="10,5">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*"/>
@@ -117,6 +117,35 @@
                     </UniformGrid>
                 </Grid>
             </Border>
+            <Border x:Name="border2" Grid.Row="1" Visibility="Collapsed" BorderBrush="#0288d1" Background="Transparent" BorderThickness="0" CornerRadius="5"  Margin="6,50,0,5">
+                <Grid Margin="10,5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="8*"/>
+                    </Grid.RowDefinitions>
+            
+                    <UniformGrid Grid.Row="1">
+                        <DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}" Background="#00000000" 
+                       ColumnHeaderHeight="35"  
+                      RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
+                      Foreground="Gray"  >
+    
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Binding="{Binding No}" Header="2序号" />
+                                <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="2计划编号" Width="1*" />
+                                <DataGridTextColumn Binding="{Binding MaterialCode}" Header="2物料编号" Width="1*"  />
+                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="2物料名称" Width="3*"  />
+                                <DataGridTextColumn Binding="{Binding PlanAmount}" Header="2计划数量" Width="*"  />
+                                <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="2完成数量" Width="*" />
+                            </DataGrid.Columns>
+                        </DataGrid>
+
+                    </UniformGrid>
+                </Grid>
+            </Border>
+
         </Grid>
     </Border>
 </UserControl>
diff --git a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml.cs b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml.cs
index b88bd319..b80f4f35 100644
--- a/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml.cs
+++ b/Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml.cs
@@ -26,5 +26,21 @@ namespace Aucma.Core.ProductOffLine.Views
             InitializeComponent();
             this.DataContext = new StatisticsPageViewModel();
         }
+
+        private void btn1_Click(object sender, RoutedEventArgs e)
+        {
+            btn1.Background = new SolidColorBrush(Color.FromRgb(23, 82, 225));
+            btn2.Background = new SolidColorBrush(Color.FromArgb(255, 56, 78, 131));
+            border1.Visibility = Visibility.Visible;
+            border2.Visibility = Visibility.Collapsed;            
+        }
+
+        private void btn2_Click(object sender, RoutedEventArgs e)
+        {
+            btn1.Background = new SolidColorBrush(Color.FromArgb(255, 56, 78, 131));
+            btn2.Background = new SolidColorBrush(Color.FromRgb(23, 82, 225));
+            border1.Visibility = Visibility.Collapsed;
+            border2.Visibility = Visibility.Visible;
+        }
     }
 }