From 0c7b176c333780501440d85c9c199df0bb0b631e Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 12 Dec 2024 12:45:05 +0800
Subject: [PATCH] =?UTF-8?q?change-=E8=B0=83=E6=95=B4=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E5=88=86=E5=8F=91-=E6=8C=89=E8=B0=83=E6=8B=A8=E5=8D=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=86=E8=BE=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SlnMesnac.RfidUpload.NLog.csproj          |  4 +++
 .../TransferOrderWindow.xaml                  | 30 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/SlnMesnac.RfidUpload.NLog/SlnMesnac.RfidUpload.NLog.csproj b/SlnMesnac.RfidUpload.NLog/SlnMesnac.RfidUpload.NLog.csproj
index 1f2e2c3..8733649 100644
--- a/SlnMesnac.RfidUpload.NLog/SlnMesnac.RfidUpload.NLog.csproj
+++ b/SlnMesnac.RfidUpload.NLog/SlnMesnac.RfidUpload.NLog.csproj
@@ -9,6 +9,10 @@
       <EmbeddedResource Remove="C:\Users\Administrator\.nuget\packages\nlog.config\4.7.15\contentFiles\any\any\NLog.config" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="log4net" Version="3.0.3" />
+    </ItemGroup>
+
     <ItemGroup>
       <Reference Include="log4net">
         <HintPath>..\packages\log4net.dll</HintPath>
diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
index 8c46922..da93d4c 100644
--- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
+++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.RfidUpload.UI"
-        mc:Ignorable="d"
-        Title="容器封发-按调拨单" Height="650" Width="1350">
+        mc:Ignorable="d"  WindowState="Maximized"
+        Title="容器封发-按调拨单" Height="768" Width="1024">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
@@ -60,22 +60,22 @@
         <DataGrid Grid.Row="2" Name="DG" ItemsSource="{Binding TransferOrderInfoItems}" Background="Transparent" 
               FontSize="15" ColumnHeaderHeight="35" 
               RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
-              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-              ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Visible" 
+              ScrollViewer.VerticalScrollBarVisibility="Visible" BorderThickness="0" CanUserAddRows="False" 
               Foreground="#0288d1" >
             <!--resourceStyle 399行修改选中字体颜色-->
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="*" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="*" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="1.5*">
+                <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="50" IsReadOnly="True"/>
+                <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="120" 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"/>-->