TyroneGit/FATrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Excel 数据导入

Browse Source
This commit is contained in:
Tyrone CT
2026-01-14 21:00:14 +08:00
parent f1a892281b
commit 82d0bd6b95
10 changed files with 814 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FATrace.Model/FileModel/OEMInventoryTransaction.cs
View File

@@ -40,18 +40,18 @@ namespace FATrace.Model
public string? RawName { get; set; }
/// <summary>
/// 入库总重量 KG
/// 入库总箱数
/// </summary>
public string? TotalInWeightKg { get; set; }
public string? TotalInCase { get; set; }
/// <summary>
/// 出库总重量 KG
/// 出库总箱数
/// </summary>
public string? TotalOutWeightKg { get; set; }
public string? TotalOutCase { get; set; }
/// <summary>
/// 剩余重量 KG
/// 剩余箱数
/// </summary>
public string? RemainWeightKg { get; set; }
public string? RemainCase { get; set; }
}
}

8
FATrace.WPLApp/Services/ReadFileServices.cs
View File

@@ -592,13 +592,13 @@ namespace FATrace.WPLApp.Services
Origin = GetCellString(row, 2, formatter),
RawCode = GetCellString(row, 3, formatter),
RawName = GetCellString(row, 4, formatter),
TotalInWeightKg = GetCellString(row, 5, formatter),
TotalOutWeightKg = GetCellString(row, 6, formatter),
RemainWeightKg = GetCellString(row, 7, formatter)
TotalInCase = GetCellString(row, 5, formatter),
TotalOutCase = GetCellString(row, 6, formatter),
RemainCase = GetCellString(row, 7, formatter)
};
if (IsAllEmpty(entity.InTime, entity.OutTime, entity.Origin, entity.RawCode, entity.RawName,
entity.TotalInWeightKg, entity.TotalOutWeightKg, entity.RemainWeightKg))
entity.TotalInCase, entity.TotalOutCase, entity.RemainCase))
continue;
list.Add(entity);

2
FATrace.WPLApp/Views/FactoryInboundView.xaml
View File

@@ -162,7 +162,7 @@
<DataGridTextColumn
Width="120"
Binding="{Binding Weight}"
Header="重量" />
Header="重量(KG)" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginDate}"

171
FATrace.WPLApp/Views/FactoryInventoryTransactionView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.FactoryInventoryTransactionView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="工厂-出入库" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,41 +48,80 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：日期范围（按入库时间） -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：日期范围（按入库时间） -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -83,14 +129,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -99,18 +147,42 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="入库时间" Binding="{Binding InTime}" Width="160" />
<DataGridTextColumn Header="出库时间" Binding="{Binding OutTime}" Width="160" />
<DataGridTextColumn Header="产地" Binding="{Binding Origin}" Width="120" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="160" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="200" />
<DataGridTextColumn Header="入库总重量KG" Binding="{Binding TotalInWeightKg}" Width="150" />
<DataGridTextColumn Header="出库总重量KG" Binding="{Binding TotalOutWeightKg}" Width="150" />
<DataGridTextColumn Header="剩余重量KG" Binding="{Binding RemainWeightKg}" Width="150" />
<DataGridTextColumn
Width="160"
Binding="{Binding InTime}"
Header="入库时间" />
<DataGridTextColumn
Width="160"
Binding="{Binding OutTime}"
Header="出库时间" />
<DataGridTextColumn
Width="120"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="160"
Binding="{Binding RawCode}"
Header="原料代码" />
<DataGridTextColumn
Width="200"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="150"
Binding="{Binding TotalInWeightKg}"
Header="入库总重量(KG)" />
<DataGridTextColumn
Width="150"
Binding="{Binding TotalOutWeightKg}"
Header="出库总重量(KG)" />
<DataGridTextColumn
Width="150"
Binding="{Binding RemainWeightKg}"
Header="剩余重量(KG)" />
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -140,16 +212,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -158,7 +246,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />

166
FATrace.WPLApp/Views/FactoryMaterialWithdrawalView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.FactoryMaterialWithdrawalView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="工厂-领料" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,41 +48,80 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：日期范围 -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：日期范围 -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -83,14 +129,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -99,17 +147,38 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="产地" Binding="{Binding Origin}" Width="120" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="160" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="200" />
<DataGridTextColumn Header="重量" Binding="{Binding Weight}" Width="120" />
<DataGridTextColumn Header="登录日" Binding="{Binding LoginDate}" Width="120" />
<DataGridTextColumn Header="登录时间" Binding="{Binding LoginTime}" Width="120" />
<DataGridTextColumn Header="登录日期时间" Binding="{Binding LoginDateTime}" Width="180" />
<DataGridTextColumn
Width="120"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="160"
Binding="{Binding RawCode}"
Header="原料代码" />
<DataGridTextColumn
Width="200"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="120"
Binding="{Binding Weight}"
Header="重量(KG)" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginDate}"
Header="登录日" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginTime}"
Header="登录时间" />
<DataGridTextColumn
Width="180"
Binding="{Binding LoginDateTime}"
Header="登录日期时间" />
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -139,16 +208,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -157,7 +242,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />

187
FATrace.WPLApp/Views/FactoryOutboundView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.FactoryOutboundView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="工厂-成品出库" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,45 +48,88 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：产地、原料代码、原料名称、批号 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：产地、原料代码、原料名称、批号 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="3"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="批号：" />
<TextBox Width="160" Text="{Binding Batch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：日期范围（登录日期时间） -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：日期范围（登录日期时间） -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -87,14 +137,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -103,20 +155,50 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="批号" Binding="{Binding Batch}" Width="120" />
<DataGridTextColumn Header="重量" Binding="{Binding Weight}" Width="100" />
<DataGridTextColumn Header="保质期" Binding="{Binding ShelfLife}" Width="80" />
<DataGridTextColumn Header="产地" Binding="{Binding Origin}" Width="100" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="140" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="180" />
<DataGridTextColumn Header="序号" Binding="{Binding SequenceNo}" Width="80" />
<DataGridTextColumn Header="登录日" Binding="{Binding LoginDate}" Width="120" />
<DataGridTextColumn Header="登录时间" Binding="{Binding LoginTime}" Width="120" />
<DataGridTextColumn Header="登录日期时间" Binding="{Binding LoginDateTime}" Width="180" />
<DataGridTextColumn
Width="120"
Binding="{Binding Batch}"
Header="批号" />
<DataGridTextColumn
Width="100"
Binding="{Binding Weight}"
Header="重量(G)" />
<DataGridTextColumn
Width="80"
Binding="{Binding ShelfLife}"
Header="保质期" />
<DataGridTextColumn
Width="100"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="80"
Binding="{Binding SequenceNo}"
Header="序号" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginDate}"
Header="登录日" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginTime}"
Header="登录时间" />
<DataGridTextColumn
Width="180"
Binding="{Binding LoginDateTime}"
Header="登录日期时间" />
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -146,16 +228,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -164,7 +262,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />

2
FATrace.WPLApp/Views/OEMInboundView.xaml
View File

@@ -162,7 +162,7 @@
<DataGridTextColumn
Width="100"
Binding="{Binding Weight}"
Header="重量" />
Header="重量(g)" />
<DataGridTextColumn
Width="80"
Binding="{Binding ShelfLife}"

171
FATrace.WPLApp/Views/OEMInventoryTransactionView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.OEMInventoryTransactionView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="OEM-出入库" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,41 +48,80 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：产地、原料代码、原料名称 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：日期范围（按入库时间） -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：日期范围（按入库时间） -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -83,14 +129,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -99,18 +147,42 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="入库时间" Binding="{Binding InTime}" Width="160" />
<DataGridTextColumn Header="出库时间" Binding="{Binding OutTime}" Width="160" />
<DataGridTextColumn Header="产地" Binding="{Binding Origin}" Width="100" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="140" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="180" />
<DataGridTextColumn Header="入库总重量KG" Binding="{Binding TotalInWeightKg}" Width="150" />
<DataGridTextColumn Header="出库总重量KG" Binding="{Binding TotalOutWeightKg}" Width="150" />
<DataGridTextColumn Header="剩余重量KG" Binding="{Binding RemainWeightKg}" Width="150" />
<DataGridTextColumn
Width="160"
Binding="{Binding InTime}"
Header="入库时间" />
<DataGridTextColumn
Width="160"
Binding="{Binding OutTime}"
Header="出库时间" />
<DataGridTextColumn
Width="100"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="150"
Binding="{Binding TotalInCase}"
Header="入库总箱数" />
<DataGridTextColumn
Width="150"
Binding="{Binding TotalOutCase}"
Header="出库总箱数 " />
<DataGridTextColumn
Width="150"
Binding="{Binding RemainCase}"
Header="剩余箱数" />
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -140,16 +212,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -158,7 +246,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />

187
FATrace.WPLApp/Views/OEMOutboundView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.OEMOutboundView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="OEM-出库" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,45 +48,88 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：产地、原料代码、原料名称、批号 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：产地、原料代码、原料名称、批号 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="3"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="批号：" />
<TextBox Width="160" Text="{Binding Batch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：日期范围（登录日期时间） -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：日期范围（登录日期时间） -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -87,14 +137,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -103,20 +155,50 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="批号" Binding="{Binding Batch}" Width="120" />
<DataGridTextColumn Header="重量" Binding="{Binding Weight}" Width="100" />
<DataGridTextColumn Header="保质期" Binding="{Binding ShelfLife}" Width="80" />
<DataGridTextColumn Header="产地" Binding="{Binding Origin}" Width="100" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="140" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="180" />
<DataGridTextColumn Header="序号" Binding="{Binding SequenceNo}" Width="80" />
<DataGridTextColumn Header="登录日" Binding="{Binding LoginDate}" Width="120" />
<DataGridTextColumn Header="登录时间" Binding="{Binding LoginTime}" Width="120" />
<DataGridTextColumn Header="登录日期时间" Binding="{Binding LoginDateTime}" Width="180" />
<DataGridTextColumn
Width="120"
Binding="{Binding Batch}"
Header="批号" />
<DataGridTextColumn
Width="100"
Binding="{Binding Weight}"
Header="重量(g)" />
<DataGridTextColumn
Width="80"
Binding="{Binding ShelfLife}"
Header="保质期" />
<DataGridTextColumn
Width="100"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="80"
Binding="{Binding SequenceNo}"
Header="序号" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginDate}"
Header="登录日" />
<DataGridTextColumn
Width="120"
Binding="{Binding LoginTime}"
Header="登录时间" />
<DataGridTextColumn
Width="180"
Binding="{Binding LoginDateTime}"
Header="登录日期时间" />
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -146,16 +228,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -164,7 +262,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />

164
FATrace.WPLApp/Views/OEMRawUsageInfoView.xaml
View File

@@ -2,12 +2,13 @@
x:Class="FATrace.WPLApp.Views.OEMRawUsageInfoView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="720"
d:DesignWidth="1280"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d"
d:DesignWidth="1280" d:DesignHeight="720">
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -26,8 +27,14 @@
FontWeight="SemiBold"
Text="OEM-原料使用信息" />
<!-- 查询条件区域 -->
<Border Grid.Row="1" Padding="10" Background="#F9F9F9" BorderBrush="#DDDDDD" BorderThickness="1" CornerRadius="4">
<!-- 查询条件区域 -->
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
@@ -41,45 +48,88 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 第一行：内袋二维码、原料代码、原料名称 -->
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" Margin="0,0,10,8">
<!-- 第一行：内袋二维码、原料代码、原料名称 -->
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="内袋二维码：" />
<TextBox Width="160" Text="{Binding InBagCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,10,8">
<StackPanel
Grid.Row="0"
Grid.Column="2"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料名称：" />
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<!-- 第二行：产地、日期范围（原料使用时间） -->
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="0,5,10,0">
<!-- 第二行：产地、日期范围（原料使用时间） -->
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="产地：" />
<TextBox Width="160" Text="{Binding Origin, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="开始日期：" />
<DatePicker Width="160" SelectedDate="{Binding StartDate, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2" Margin="0,5,10,0">
<StackPanel
Grid.Row="1"
Grid.Column="2"
Margin="0,5,10,0"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="结束日期：" />
<DatePicker Width="160" SelectedDate="{Binding EndDate, Mode=TwoWay}" />
</StackPanel>
<!-- 第三行：按钮 -->
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3" Margin="0,5,10,0" HorizontalAlignment="Right">
<Button Width="80" Margin="0,0,8,0" Command="{Binding SearchCommand}">
<!-- 第三行：按钮 -->
<StackPanel
Grid.Row="2"
Grid.Column="3"
Margin="0,5,10,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding SearchCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe952;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe952;" />
<TextBlock Text="查询" />
</StackPanel>
</Button>
<Button Width="80" Margin="0,0,8,0" Command="{Binding ClearCommand}">
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,6,0" FontFamily="/Assets/Fonts/#iconfont" FontSize="16" Text="&#xe60a;" />
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
@@ -87,14 +137,16 @@
</Grid>
</Border>
<!-- 列表区域 -->
<DataGrid Grid.Row="2" Margin="0,10,0,10"
ItemsSource="{Binding Items}"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
RowHeight="34">
<!-- 列表区域 -->
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
@@ -103,16 +155,31 @@
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="原料使用时间" Binding="{Binding RawUseTime}" Width="160" />
<DataGridTextColumn Header="内袋二维码" Binding="{Binding InBagCode}" Width="260" />
<DataGridTextColumn Header="原料产地" Binding="{Binding Origin}" Width="120" />
<DataGridTextColumn Header="原料名称" Binding="{Binding RawName}" Width="160" />
<DataGridTextColumn Header="原料代码" Binding="{Binding RawCode}" Width="140" />
<DataGridTextColumn Header="视频链接" Binding="{Binding VideoUrl}" Width="200" />
<DataGridTextColumn
Width="160"
Binding="{Binding RawUseTime}"
Header="原料使用时间" />
<DataGridTextColumn
Width="260"
Binding="{Binding InBagCode}"
Header="内袋二维码" />
<DataGridTextColumn
Width="120"
Binding="{Binding Origin}"
Header="原料产地" />
<DataGridTextColumn
Width="160"
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
<!--<DataGridTextColumn Header="视频链接" Binding="{Binding VideoUrl}" Width="200" />-->
</DataGrid.Columns>
</DataGrid>
<!-- 状态栏 -->
<!-- 状态栏 -->
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页：" />
@@ -142,16 +209,32 @@
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button Content="|&lt;" Width="40" Margin="5,0" Command="{Binding FirstPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content="&lt;" Width="40" Margin="5,0" Command="{Binding PrevPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">" Width="40" Margin="5,0" Command="{Binding NextPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button Content=">|" Width="40" Margin="5,0" Command="{Binding LastPageCommand}" />
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
@@ -160,7 +243,10 @@
<TextBlock Text="页大小：" />
</StatusBarItem>
<StatusBarItem>
<ComboBox Width="80" SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectedValuePath="Content">
<ComboBox
Width="80"
SelectedValue="{Binding PageSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Content">
<ComboBoxItem Content="10" />
<ComboBoxItem Content="20" />
<ComboBoxItem Content="50" />