change-调整容器分发-按调拨单界面分辨率

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>

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"
+        mc:Ignorable="d"  WindowState="Maximized"
-        Title="容器封发-按调拨单" Height="650" Width="1350">
+        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" 
+              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Visible" 
-              ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+              ScrollViewer.VerticalScrollBarVisibility="Visible" BorderThickness="0" CanUserAddRows="False" 
               Foreground="#0288d1" >
             <!--resourceStyle 399行修改选中字体颜色-->
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding no}" Header="序号" Width="50" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding dbdh}" Header="调拨单号" Width="200" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding jsdw}" Header="调入局" Width="100" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding ffjhNo}" Header="封发计划编号" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqzlbm}" Header="容器种类编码" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqzlmc}" Header="容器种类名称" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqxhbm}" Header="容器型号编码" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding rqxhmc}" Header="容器型号名称" Width="150" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding kdbsl}" Header="可调拨数量" Width="*" 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="*" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding ffjhscrq,StringFormat=\{0:MM月dd日 HH:mm.ss.ffff\}}" Header="生成日期" Width="120" IsReadOnly="True"/>
-                <DataGridTemplateColumn Header="操作" Width="1.5*">
+                <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"/>-->