From 6c558e015953b502cbfa0c5a6729b92352cbea57 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sat, 31 Aug 2024 19:17:56 +0800
Subject: [PATCH] =?UTF-8?q?change-=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 5c234b5..e4c792f 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2251,7 +2251,7 @@
                                                         <ColumnDefinition Width="*"/>
                                                         <ColumnDefinition Width="*"/>
                                                         <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="0.5*"/>
                                                         <ColumnDefinition Width="*"/>
                                                         <ColumnDefinition Width="*"/>
                                                     </Grid.ColumnDefinitions>
@@ -2265,7 +2265,7 @@
                                                         <RowDefinition Height="*"/>
                                                         <RowDefinition Height="*"/>
                                                     </Grid.RowDefinitions>
-                                                    <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="1" Grid.Column="5" Grid.RowSpan="2" Margin="20 0 0 0">
+                                                    <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="1" Grid.Column="4" Grid.RowSpan="2" Margin="20 0 0 0">
                                                         
                                                         <StackPanel Orientation="Vertical" >
                                                            
@@ -2273,6 +2273,16 @@
                                                             <TextBlock x:Name="thisOutEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/>
                                                         </StackPanel>
                                                     </Border>
+                                                       <Border BorderBrush="White" BorderThickness="0"  Grid.ColumnSpan="1" Grid.Column="6" Grid.RowSpan="2" Margin="20 0 0 0">
+                                                        
+                                                        <StackPanel Orientation="Vertical" >
+
+                                                            <Button Content="选择出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
+                                                            <Button  Content="继续出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,50,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
+
+                                                        </StackPanel>
+                                                    </Border>
+                                                   
                                                     <Border BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="6" Grid.RowSpan="2" Margin="20">
 
 
@@ -2403,8 +2413,7 @@
                                                         <Grid>
                                                             <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="outMaterialNameTxt" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                         </Grid>
-                                                        <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
-                                                        <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
+                                                       
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="6">
                                                         <TextBlock Text="物料规格:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>