初期稳定版本260119

This commit is contained in:
2026-01-19 12:40:45 +08:00
parent 82d0bd6b95
commit f65fa21760
32 changed files with 2494 additions and 138 deletions

View File

@@ -237,7 +237,6 @@
BorderThickness="1"
CornerRadius="6">
<Canvas Margin="-3,0,0,0">
<Rectangle
Canvas.Top="136.567"
Width="62"
@@ -749,42 +748,44 @@
VerticalAlignment="Top"
Content="工作站" />
<Label
Canvas.Left="924"
Canvas.Top="160"
HorizontalAlignment="Center"
Canvas.Left="927"
Canvas.Top="147"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="SkyBlue"
Content="喷码数据"
FontSize="6"
FontSize="14"
FontWeight="Bold" />
<TextBlock
Canvas.Left="924"
Canvas.Top="179"
x:Name="喷码数据"
Canvas.Left="927"
Canvas.Top="178"
Padding="2"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Background="LightGray"
FontSize="10"
Text="DYG05030013,20250923,802,3,01,0001"
Background="LimeGreen"
FontSize="12"
Text="{Binding LatestBoxSprayCode}"
TextWrapping="Wrap" />
<Label
Canvas.Left="924"
Canvas.Top="208"
HorizontalAlignment="Center"
Canvas.Left="928"
Canvas.Top="207"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="SkyBlue"
Content="扫码数据"
FontSize="6"
Content="外箱扫码数据"
FontSize="14"
FontWeight="Bold" />
<TextBlock
Canvas.Left="924"
Canvas.Top="227"
x:Name="外箱扫码数据"
Canvas.Left="929"
Canvas.Top="238"
Padding="2"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Background="LightGray"
FontSize="10"
Text="DYG05030013,20250923,802,3,01,0001"
Background="LimeGreen"
FontSize="12"
Text="{Binding LatestBoxScanCode}"
TextWrapping="Wrap" />
<Label
Canvas.Left="634"
@@ -793,35 +794,51 @@
VerticalAlignment="Top"
Content="内包扫码" />
<Label
Canvas.Left="637"
Canvas.Top="46"
Canvas.Left="639"
Canvas.Top="27"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="SkyBlue"
Content="扫码数据"
FontSize="6"
Content="内包扫码数据"
FontSize="14"
FontWeight="Bold" />
<TextBlock
Canvas.Left="637"
Canvas.Top="65"
x:Name="内包扫码数据"
Canvas.Left="639"
Canvas.Top="59"
Padding="2"
HorizontalAlignment="Left"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Background="LightGray"
FontSize="10"
Text="DYG05030013,20250923,802,3,01,0001"
Background="LimeGreen"
FontSize="12"
Text="{Binding LatestWeightScanCode}"
TextWrapping="Wrap" />
<ListView
Canvas.Left="588"
Canvas.Top="155"
Width="260"
Height="200"
HorizontalAlignment="Left"
VerticalAlignment="Center"
d:ItemsSource="{d:SampleData ItemCount=5}">
x:Name="LineTempCodeList"
Canvas.Left="1138"
Canvas.Top="5"
Width="420"
Height="425"
HorizontalAlignment="Center"
VerticalAlignment="Top"
d:ItemsSource="{d:SampleData ItemCount=5}"
BorderBrush="Gray"
BorderThickness="1"
ItemsSource="{Binding LineTempCodes}">
<ListView.View>
<GridView>
<GridViewColumn />
<GridViewColumn
Width="50"
DisplayMemberBinding="{Binding Id}"
Header="序号" />
<GridViewColumn
Width="200"
DisplayMemberBinding="{Binding Code}"
Header="条码" />
<GridViewColumn
Width="150"
DisplayMemberBinding="{Binding CreateTime, StringFormat='MM-dd HH:mm:ss'}"
Header="时间" />
</GridView>
</ListView.View>
</ListView>

View File

@@ -0,0 +1,87 @@
<UserControl
x:Class="FATrace.WPLApp.Views.DialogWeightUserEditView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
Width="520"
Height="320"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<Grid Margin="16">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Row="0"
Grid.ColumnSpan="2"
Margin="0,0,0,12"
FontSize="18"
FontWeight="SemiBold"
Text="{Binding Title}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Text="确认者:" />
<TextBox
Grid.Row="1"
Grid.Column="1"
Height="30"
Text="{Binding CheckName, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="0,10,0,0"
VerticalAlignment="Center"
Text="操作者:" />
<TextBox
Grid.Row="2"
Grid.Column="1"
Height="30"
Margin="0,10,0,0"
Text="{Binding OpName, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="0,10,0,0"
VerticalAlignment="Center"
Text="密码:" />
<TextBox
Grid.Row="3"
Grid.Column="1"
Height="30"
Margin="0,10,0,0"
Text="{Binding Password, UpdateSourceTrigger=PropertyChanged}" />
<StackPanel
Grid.Row="4"
Grid.ColumnSpan="2"
Margin="0,18,0,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Width="90"
Margin="0,0,10,0"
Command="{Binding SaveCommand}"
Content="保存" />
<Button
Width="90"
Command="{Binding CancelCommand}"
Content="取消" />
</StackPanel>
</Grid>
</UserControl>

View File

@@ -0,0 +1,15 @@
using System.Windows.Controls;
namespace FATrace.WPLApp.Views
{
/// <summary>
/// DialogWeightUserEditView.xaml 的交互逻辑
/// </summary>
public partial class DialogWeightUserEditView : UserControl
{
public DialogWeightUserEditView()
{
InitializeComponent();
}
}
}

View File

@@ -154,7 +154,7 @@
<DataGridTextColumn
Width="160"
Binding="{Binding OutTime}"
Header="出库时间" />
Header="领料时间" />
<DataGridTextColumn
Width="120"
Binding="{Binding Origin}"
@@ -168,15 +168,15 @@
Binding="{Binding RawName}"
Header="原料名称" />
<DataGridTextColumn
Width="150"
Width="160"
Binding="{Binding TotalInWeightKg}"
Header="入库总重量(KG)" />
<DataGridTextColumn
Width="150"
Width="160"
Binding="{Binding TotalOutWeightKg}"
Header="出库总重量(KG)" />
Header="领料总重量(KG)" />
<DataGridTextColumn
Width="150"
Width="160"
Binding="{Binding RemainWeightKg}"
Header="剩余重量(KG)" />
</DataGrid.Columns>

View File

@@ -108,8 +108,8 @@
<DataGridTextColumn Header="保质期" Binding="{Binding ShelfLife}" Width="80" />
<DataGridTextColumn Header="称重重量(g)" Binding="{Binding Weight}" Width="120" />
<DataGridTextColumn Header="配料日期" Binding="{Binding DeliveryDate}" Width="120" />
<DataGridTextColumn Header="剩余重量(Kg)" Binding="{Binding RemainWeight}" Width="130" />
<DataGridTextColumn Header="入库总重量(Kg)" Binding="{Binding StockWeight}" Width="140" />
<DataGridTextColumn Header="剩余重量(Kg)" Binding="{Binding RemainWeight}" Width="150" />
<DataGridTextColumn Header="入库总重量(Kg)" Binding="{Binding StockWeight}" Width="170" />
<DataGridTextColumn Header="称重时间" Binding="{Binding WeightTime}" Width="160" />
<DataGridTextColumn Header="操作者" Binding="{Binding OpUser}" Width="100" />
<DataGridTextColumn Header="确认者" Binding="{Binding CheckUser}" Width="120" />

View File

@@ -1,14 +1,16 @@
<UserControl x:Class="FATrace.WPLApp.Views.HelpManualView"
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:local="clr-namespace:FATrace.WPLApp.Views"
xmlns:pdfViewer="clr-namespace:Syncfusion.Windows.PdfViewer;assembly=Syncfusion.PdfViewer.WPF"
xmlns:prism="http://prismlibrary.com/"
mc:Ignorable="d"
prism:ViewModelLocator.AutoWireViewModel="True"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl
x:Class="FATrace.WPLApp.Views.HelpManualView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FATrace.WPLApp.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pdfViewer="clr-namespace:Syncfusion.Windows.PdfViewer;assembly=Syncfusion.PdfViewer.WPF"
xmlns:prism="http://prismlibrary.com/"
d:DesignHeight="450"
d:DesignWidth="800"
prism:ViewModelLocator.AutoWireViewModel="True"
mc:Ignorable="d">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
@@ -72,9 +74,7 @@
<Grid Grid.Row="2" Margin="0,10,0,10">
<pdfViewer:PdfViewerControl ItemSource="{Binding PdfFilePath}" />
<Border
Background="#CCFFFFFF"
Visibility="{Binding IsBusy, Converter={StaticResource Bool2Vis}}">
<Border Background="#CCFFFFFF" Visibility="{Binding IsBusy, Converter={StaticResource Bool2Vis}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock
HorizontalAlignment="Center"

View File

@@ -74,6 +74,15 @@
<TextBox Width="160" Text="{Binding RawName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<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
Grid.Row="1"
@@ -159,6 +168,10 @@
Width="100"
Binding="{Binding Origin}"
Header="产地" />
<DataGridTextColumn
Width="120"
Binding="{Binding Batch}"
Header="批号" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"

View File

@@ -0,0 +1,224 @@
<UserControl
x:Class="FATrace.WPLApp.Views.WeightUserManageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="Bool2Vis" />
</UserControl.Resources>
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock
Grid.Row="0"
Margin="0,0,0,8"
FontSize="20"
FontWeight="SemiBold"
Text="称重用户管理" />
<Border
Grid.Row="1"
Padding="10"
Background="#F9F9F9"
BorderBrush="#DDDDDD"
BorderThickness="1"
CornerRadius="4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="2*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel
Grid.Row="0"
Grid.Column="0"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="确认者:" />
<TextBox Width="220" Text="{Binding CheckName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="操作者:" />
<TextBox Width="220" Text="{Binding OpName, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
Grid.ColumnSpan="2"
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 Text="查询" />
</StackPanel>
</Button>
<Button
Width="80"
Margin="0,0,18,0"
Command="{Binding ClearCommand}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,6,0"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Text="&#xe60a;" />
<TextBlock Text="清空" />
</StackPanel>
</Button>
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding AddCommand}"
IsEnabled="{Binding CanEditUsers}">
<TextBlock Text="新增" />
</Button>
<Button
Width="80"
Margin="0,0,8,0"
Command="{Binding EditCommand}"
IsEnabled="{Binding CanEditUsers}">
<TextBlock Text="编辑" />
</Button>
<Button
Width="80"
Command="{Binding DeleteCommand}"
IsEnabled="{Binding CanEditUsers}">
<TextBlock Text="删除" />
</Button>
</StackPanel>
</Grid>
</Border>
<DataGrid
Grid.Row="2"
Margin="0,10,0,10"
AutoGenerateColumns="False"
CanUserAddRows="False"
FontSize="15"
IsReadOnly="True"
ItemsSource="{Binding Items}"
RowHeight="34"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="18" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTextColumn
Width="80"
Binding="{Binding Id}"
Header="Id"
Visibility="Hidden" />
<DataGridTextColumn
Width="180"
Binding="{Binding CheckName}"
Header="确认者" />
<DataGridTextColumn
Width="180"
Binding="{Binding OpName}"
Header="操作者" />
<DataGridTextColumn
Width="180"
Binding="{Binding CreateTime, StringFormat=yyyy-MM-dd HH:mm:ss}"
Header="创建时间" />
</DataGrid.Columns>
</DataGrid>
<StatusBar Grid.Row="3">
<StatusBarItem>
<TextBlock Text="本页:" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="{Binding Items.Count}" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text=" 总数:" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="{Binding TotalCount}" />
</StatusBarItem>
<StatusBarItem>
<Separator Width="20" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="页码:" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="{Binding PageIndex}" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="/" />
</StatusBarItem>
<StatusBarItem>
<TextBlock Text="{Binding TotalPages}" />
</StatusBarItem>
<StatusBarItem>
<Button
Width="40"
Margin="5,0"
Command="{Binding FirstPageCommand}"
Content="|&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button
Width="40"
Margin="5,0"
Command="{Binding PrevPageCommand}"
Content="&lt;" />
</StatusBarItem>
<StatusBarItem>
<Button
Width="40"
Margin="5,0"
Command="{Binding NextPageCommand}"
Content="&gt;" />
</StatusBarItem>
<StatusBarItem>
<Button
Width="40"
Margin="5,0"
Command="{Binding LastPageCommand}"
Content="&gt;|" />
</StatusBarItem>
<StatusBarItem HorizontalAlignment="Right">
<TextBlock Text="正在处理..." Visibility="{Binding IsBusy, Converter={StaticResource Bool2Vis}}" />
</StatusBarItem>
</StatusBar>
</Grid>
</UserControl>

View File

@@ -0,0 +1,15 @@
using System.Windows.Controls;
namespace FATrace.WPLApp.Views
{
/// <summary>
/// WeightUserManageView.xaml 的交互逻辑
/// </summary>
public partial class WeightUserManageView : UserControl
{
public WeightUserManageView()
{
InitializeComponent();
}
}
}