add - 添加成品下线质检页面

dev
liuwf 1 year ago
parent cc327e020a
commit d650ee8870

@ -501,6 +501,46 @@
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.Perfusion_DeviceStatus">
<summary>
灌注设备状态表
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.ObjId">
<summary>
主键
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.PerfusionDevicetype">
<summary>
设备名称;Perfusion:灌注
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.PerfusionStatus">
<summary>
设备状态1运行、2停机、3故障
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.Perfusion_DeviceStatus.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息
@ -1076,6 +1116,131 @@
创建时间
</summary>
</member>
<member name="T:Admin.Core.Model.Perfusion_Alarm">
<summary>
灌注告警
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.ObjId">
<summary>
灌注
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionBoxcode">
<summary>
箱体码
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionStatus">
<summary>
报警状态码
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionAlarm">
<summary>
报警信息
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionCompleted">
<summary>
异常是否取消
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="T:Admin.Core.Model.Perfusion_Record">
<summary>
灌注记录表
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.ObjId">
<summary>
主键
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionBoxCode">
<summary>
箱体吗
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionRefrigerantTypeLeft">
<summary>
冷媒类型;左侧冷媒型号
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionRefrigerantTypeRight">
<summary>
冷媒类型;右侧侧冷媒型号
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionSetVolume">
<summary>
设置灌注量
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionActualVolume">
<summary>
实际灌注量
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionR">
<summary>
灌注压力_R
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionL">
<summary>
灌注压力_L
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionDuration">
<summary>
灌注时长
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.PerfusionSystem">
<summary>
系统;0,右系统 1左系统
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.Perfusion_Record.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="T:Admin.Core.Model.ProductOrderInfo">
<summary>
订单执行表

@ -80,6 +80,9 @@
</ItemGroup>
<ItemGroup>
<Compile Update="Views\QualityPageView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Views\StatisticsPageView.xaml.cs">
<SubType>Code</SubType>
</Compile>

@ -21,7 +21,8 @@ namespace Aucma.Core.ProductOffLine.ViewModels
#endregion
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
private IndexPageView firstPage = new IndexPageView();//首页
private StatisticsPageView recordPage = new StatisticsPageView();
private StatisticsPageView recordPage = new StatisticsPageView(); // 统计页面
private QualityPageView qualityPage = new QualityPageView(); // 质检页面
public MainWindowViewModel()
{
@ -163,6 +164,9 @@ namespace Aucma.Core.ProductOffLine.ViewModels
case "RecordPage":
UserContent = recordPage;
break;
case "QualityPage":
UserContent = qualityPage;
break;
default:
break;
}

@ -0,0 +1,101 @@
using Admin.Core.Model;
using Aucma.Core.ProductOffLine.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Documents;
namespace Aucma.Core.ProductOffLine.ViewModels
{
public partial class QualityPageViewModel : ObservableObject
{
public QualityPageViewModel() { LoadData(); }
List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>();
#region 加载DataGrid数据
private void LoadData()
{
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 50, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 2, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 60, CompleteAmount = 40 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 3, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 50, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 4, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 40, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 5, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 30, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 6, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 50, CompleteAmount = 20 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 7, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 10, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 8, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 50, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 9, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 80, CompleteAmount = 10 });
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 10, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉SC", PlanAmount = 50, CompleteAmount = 10});
}
#endregion
#region 初始化datagrid
private ObservableCollection<MaterialComplateInfo> materialDataGrid = new ObservableCollection<MaterialComplateInfo>();
public ObservableCollection<MaterialComplateInfo> MaterialDataGrid
{
get { return materialDataGrid; }
set
{
materialDataGrid = value;
OnPropertyChanged();//属性通知
}
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
[RelayCommand]
private void ExecQuery(object obj)
{
//List<CodeBindingRecord> list;
//var result = (StatisticModel)obj;
//if (string.IsNullOrEmpty(result.BeginTime) && string.IsNullOrEmpty(result.EndTime))
//{
// list = await _codeBindingRecordServices.QueryAllByTime(null, null);
//}
//else if (string.IsNullOrEmpty(result.BeginTime))
//{
// list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, null);
//}
//else if (string.IsNullOrEmpty(result.EndTime))
//{
// list = await _codeBindingRecordServices.QueryAllByTime(null, result.EndTime);
//}
//else
//{
// DateTime theBeginTime = Convert.ToDateTime(result.BeginTime);
// DateTime theEndTime = Convert.ToDateTime(result.EndTime);
// if (theBeginTime > theEndTime)
// {
// MessageBox.Show("结束时间要大于开始时间!");
// return;
// }
// list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, result.EndTime);
//}
//if (list != null)
//{
// System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
// {
// MaterialDataGrid.Clear();
// foreach (CodeBindingRecord item in list)
// {
// MaterialDataGrid.Add(new ReaderInfo() { No = item.ObjId, BoxCode = item.BoxCode, BoxName = item.BoxName, ProductCode = item.ProductCode, BindingResult = item.BindingResult, RecordTime = item.RecordTime1.ToString() });
// }
// }));
//}
}
#endregion
}
}

@ -64,6 +64,7 @@
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="实时监控" x:Name="FirstPage" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" Margin="5 0" />
<Button Content="任务记录" x:Name="RecordPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RecordPage}" />
<Button Content="质检分垛" x:Name="QualityData" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=QualityPage}" />
<Button Content="键盘" x:Name="TabTip" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>

@ -0,0 +1,174 @@
<UserControl x:Class="Aucma.Core.ProductOffLine.Views.QualityPageView"
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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
xmlns:cvt="clr-namespace:Aucma.Core.ProductOffLine.ConvertTo"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>-->
<!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="30"/>
<Setter Property="FontSize" Value="14"/>
</Style>
</UserControl.Resources>
<Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="9*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
<TextBlock Text="质检页面" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Button x:Name="btn1" Content="入库记录" HorizontalAlignment="Left" Margin="37,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF1752E1"/>
<Button x:Name="btn2" Content="入库统计" HorizontalAlignment="Left" Margin="135,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" />
<Border x:Name="border1" Grid.Row="1" Visibility="Visible" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,50,5,5">
<Grid Margin="10,5">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="8*"/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="开始时间" Margin="10 0" Foreground="Gray" FontSize="15" VerticalAlignment="Center"/>
<DatePicker
x:Name="BeginTime"
Width="200" Margin="10 0" Text="2023-10-09"
materialDesign:CalendarAssist.IsHeaderVisible="False"
materialDesign:HintAssist.Hint="开始日期">
<DatePicker.SelectedDate>
<Binding
Path="FutureValidatingDate"
UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
</Binding.ValidationRules>
</Binding>
</DatePicker.SelectedDate>
</DatePicker>
<TextBlock Text="结束时间" Margin="10 0" Foreground="Gray" FontSize="15" VerticalAlignment="Center"/>
<DatePicker
x:Name="EndTime" Margin="10 0" Text="2023-10-09"
Width="200"
materialDesign:CalendarAssist.IsHeaderVisible="False"
materialDesign:HintAssist.Hint="结束日期">
<DatePicker.SelectedDate>
<Binding
Path="FutureValidatingDate"
UpdateSourceTrigger="PropertyChanged">
<Binding.ValidationRules>
</Binding.ValidationRules>
</Binding>
</DatePicker.SelectedDate>
</DatePicker>
<Button Margin="10 0"
Content="查询" Command="{Binding ExecQueryCommand}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
Style="{StaticResource MaterialDesignRaisedSecondaryDarkButton}"
ToolTip="Resource name: MaterialDesignRaisedSecondaryDarkButton">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource QueryConvert}">
<Binding ElementName="BeginTime" Path="Text"/>
<Binding ElementName="EndTime" Path="Text"/>
</MultiBinding>
</Button.CommandParameter>
</Button>
</WrapPanel>
<UniformGrid Grid.Row="1">
<DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}" Background="#00000000"
ColumnHeaderHeight="35"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="Gray" >
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<!--表头剧中-->
<!--<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
<Setter Property="BorderThickness" Value="1" />
</Setter>
</Style>
</DataGrid.ColumnHeaderStyle>-->
<!--修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" />
<DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="订单号" Width="1*" />
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料条码" Width="3*" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料型号" Width="3*" />
<DataGridTextColumn Binding="{Binding PlanAmount}" Header="物料编码" Width="3*" />
<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="扫描时间" Width="2*" />
</DataGrid.Columns>
</DataGrid>
</UniformGrid>
</Grid>
</Border>
<Border x:Name="border2" Grid.Row="1" Visibility="Collapsed" BorderBrush="#0288d1" Background="Transparent" BorderThickness="1" CornerRadius="5" Margin="6,50,0,5">
<Grid Margin="10,5">
<!--<Grid.RowDefinitions>
<RowDefinition Height="8*"/>
</Grid.RowDefinitions>-->
<UniformGrid Grid.Row="1">
<DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}" Background="#00000000"
ColumnHeaderHeight="35"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="Gray" >
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" />
<DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="库" Width="1*" />
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料条码" Width="3*" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料型号" Width="3*" />
<DataGridTextColumn Binding="{Binding PlanAmount}" Header="数量" Width="*" />
<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="入库时间" Width="2*" />
</DataGrid.Columns>
</DataGrid>
</UniformGrid>
</Grid>
</Border>
</Grid>
</Border>
</UserControl>

@ -0,0 +1,31 @@
using Aucma.Core.ProductOffLine.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Core.ProductOffLine.Views
{
/// <summary>
/// StatisticsPageView.xaml 的交互逻辑
/// </summary>
public partial class QualityPageView : UserControl
{
public QualityPageView()
{
InitializeComponent();
this.DataContext = new QualityPageViewModel();
}
}
}
Loading…
Cancel
Save