wenjy
/
SlnMesnac.RfidUpload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-提交修改

Browse Source
master
liuwf 1 month ago
parent 28aa74a91b
commit 162cf1818e
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File

20
SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml
Unescape Escape View File

@ -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"/>-->

2
SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml
Unescape Escape View File

@ -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"/>-->

6
SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save