From dca7a748b101a045c1072ca7153e55f520e21c62 Mon Sep 17 00:00:00 2001
From: "nodyang@aliyun.com" <nodyang@aliyun.com>
Date: Mon, 23 Dec 2024 08:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerTransferOrderWindow.xaml         | 22 ++++++++++++++-----
 .../TransferOrderWindow.xaml                  | 14 ++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
index 3c93083..c5f1659 100644
--- a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
@@ -78,17 +78,29 @@
                 <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
                 <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
                 <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
-                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="80*" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170*" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="150">
+                <DataGridTemplateColumn Header="操作" Width="220">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <!--<Button Content="编辑" Command="{Binding DataContext.CabinetUpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
 
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <Button Content="封发配发" Command="{Binding DataContext.ExecuteCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,5,0"/>
-                                <Button Content="更新" Visibility="Collapsed" Command="{Binding DataContext.ExecuteCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,5,0"/>
-                                <Button Content="删除" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,0,0,0"/>
+                                <Button Content="封发配发" Command="{Binding DataContext.ExecuteCommand,
+                                    RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" 
+                                        CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14"
+                                        Width="120" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center"
+                                        HorizontalAlignment="Center" Margin="0,0,5,0"/>
+
+                                <Button Content="更新" Visibility="Collapsed" Command="{Binding DataContext.ExecuteCommand, 
+                                    RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}" 
+                                        Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30"
+                                        Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center"
+                                        HorizontalAlignment="Center" Margin="0,0,5,0"/>
+
+                                <Button Content="删除" Command="{Binding DataContext.DeleteCommand,
+                                    RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}" 
+                                        Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,0,0,0"/>
             </StackPanel>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
index 1664179..ffaa1c7 100644
--- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
@@ -80,16 +80,22 @@
                 <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
                 <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
                 <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True" Visibility="Collapsed"/>
-                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="80*" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="150">
+                <DataGridTemplateColumn Header="操作" Width="220">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <!--<Button Content="编辑" Command="{Binding DataContext.CabinetUpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
 
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <Button Content="执行封发" Command="{Binding DataContext.ExecuteCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,5,0"/>
-                           <Button Content="删除" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="80" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,0,0,0"/>
+                                <Button Content="执行封发" Command="{Binding DataContext.ExecuteCommand,
+                                    RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                        CommandParameter="{Binding}" 
+                                        Style="{StaticResource  BUTTON_AGREE}" FontSize="14" Width="120" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,5,0"/>
+                           <Button Content="删除" Command="{Binding DataContext.DeleteCommand,
+                               RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                   CommandParameter="{Binding}"  Style="{StaticResource  BUTTON_AGREE}" FontSize="14"
+                                   Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,0,0,0"/>
             </StackPanel>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>