From 162cf1818e6074e61f76a49356aa15d13edb55f5 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 17 Dec 2024 14:18:33 +0800
Subject: [PATCH] =?UTF-8?q?change-=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerTransferOrderWindow.xaml         | 20 +++++++++----------
 .../TransferOrderWindow.xaml                  |  2 +-
 .../viewModel/TransferOrderViewModel.cs       |  6 ++++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
index ba2295b..a03c9ca 100644
--- a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
@@ -72,16 +72,16 @@
             <!--resourceStyle 399行修改选中字体颜色-->
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="50" IsReadOnly="True" Visibility="Collapsed"/>
-                <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="200" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="180">
+                <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="200*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170*" IsReadOnly="True"/>
+                <DataGridTemplateColumn Header="操作" Width="150">
                     <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"/>-->
diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
index eb32ab5..3939ee7 100644
--- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
@@ -82,7 +82,7 @@
                 <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150*" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="150*" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="170" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="180">
+                <DataGridTemplateColumn Header="操作" Width="150">
                     <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"/>-->
diff --git a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
index 77e167b..6e89893 100644
--- a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
+++ b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
@@ -208,8 +208,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
                 }
                 else
                 {
-                    TransferOrderInfoItems = new ObservableCollection<TransferOrderInfo>(new List<TransferOrderInfo>());
-                    TotalAmount = TransferOrderInfoItems.Count.ToString();
+                    TransferOrderInfoItems.Clear();
+                    TotalAmount = "0";
+                    //TransferOrderInfoItems = new ObservableCollection<TransferOrderInfo>(new List<TransferOrderInfo>());
+                    //TotalAmount = TransferOrderInfoItems.Count.ToString();
                 }
                 #endregion