liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 成品下线样式，逻辑

Browse Source
dev
liuwf
parent dc81e6262c
commit 120922407a
19 changed files with 418 additions and 394 deletions

2
Admin.Core.Service/Service_New/BaseQualityInspectionItemInfoServices.cs
Unescape Escape View File

@ -34,7 +34,7 @@ namespace Admin.Core.Service
/// </summary> /// </summary>
public async Task<List<BaseQualityInspectionItemInfo>> query() public async Task<List<BaseQualityInspectionItemInfo>> query()
{ {
List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoRepository.QueryAsync(x => x.ParentId == "0" && x.IsFlag == 0); List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoRepository.QueryAsync(x => x.IsFlag == 0);
return list; return list;
} }

6
Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
Unescape Escape View File

@ -6,7 +6,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views" xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views"
xmlns:cvt="clr-namespace:Aucma.Core.CodeBinding.ConvertTo" xmlns:cvt="clr-namespace:Aucma.Core.CodeBinding.ConvertTo"
mc:Ignorable="d" Background="#1152AC" mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources> <UserControl.Resources>
@ -94,7 +94,7 @@
<RowDefinition Height="8*"/> <RowDefinition Height="8*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center"> <WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="15" VerticalAlignment="Center"/> <TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<DatePicker <DatePicker
x:Name="BeginTime" FontSize="16" x:Name="BeginTime" FontSize="16"
Width="200" Margin="10 0" BorderBrush="White" Width="200" Margin="10 0" BorderBrush="White"
@ -109,7 +109,7 @@
</DatePicker.SelectedDate> </DatePicker.SelectedDate>
</DatePicker> </DatePicker>
<TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="18" VerticalAlignment="Center"/> <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<DatePicker <DatePicker
x:Name="EndTime" Margin="10 0" x:Name="EndTime" Margin="10 0"
Width="200" BorderBrush="White" FontSize="16" Width="200" BorderBrush="White" FontSize="16"

15
Aucma.Core.ProductOffLine/Business/offLineBusiness.cs
Unescape Escape View File

@ -117,7 +117,7 @@ namespace Aucma.Core.ProductOffLine.Business
{ {
//1.扫描的SN条码去条码系统校验 //1.扫描的SN条码去条码系统校验
BackResult = await HandleMaterialBarCode(code.Trim(), TempOffLineInfo1); //扫码器1 BackResult = await HandleMaterialBarCode(code.Trim(), TempOffLineInfo1); //扫码器1
materialType = TempOffLineInfo1.ProductCode; materialType = TempOffLineInfo1.ProductCode;
if (!BackResult) if (!BackResult)
{ {
return; return;
@ -141,7 +141,11 @@ namespace Aucma.Core.ProductOffLine.Business
if (BackResult == true) if (BackResult == true)
{ {
// 先查询分垛方向A或者B // 先查询分垛方向A或者B
string direction = getDirectioneEvent?.Invoke(materialType); string direction = getDirectioneEvent?.Invoke(materialType);
if (direction == "")
{
//未设置方向处理
}
bool plcResult = DownLoadPassFlag(ScannerNo, direction); //下发plc放行信号,分垛AB库 bool plcResult = DownLoadPassFlag(ScannerNo, direction); //下发plc放行信号,分垛AB库
if (plcResult == false) if (plcResult == false)
{ {
@ -162,6 +166,7 @@ namespace Aucma.Core.ProductOffLine.Business
{ {
try try
{ {
OffLineInfo info11 = MapperTwo(TempOffLineInfo); OffLineInfo info11 = MapperTwo(TempOffLineInfo);
// 添加成品下线表 // 添加成品下线表
await _offLineInfoServices.AddAsync(info11); await _offLineInfoServices.AddAsync(info11);
@ -215,8 +220,10 @@ namespace Aucma.Core.ProductOffLine.Business
/// <returns></returns> /// <returns></returns>
public async Task<bool> HandleMaterialBarCode(string BarCode,TempInfo TempOffLineInfo) public async Task<bool> HandleMaterialBarCode(string BarCode,TempInfo TempOffLineInfo)
{ {
try try
{ {
// 1.先质检
TempOffLineInfo.QualityResult = "成功";
Thread.Sleep(10000); Thread.Sleep(10000);
TempOffLineInfo.ProductSNCode = BarCode.Trim(); //产品SN条码*1 TempOffLineInfo.ProductSNCode = BarCode.Trim(); //产品SN条码*1
TempOffLineInfo.ProductScanTime = System.DateTime.Now; // 扫码时间*2 TempOffLineInfo.ProductScanTime = System.DateTime.Now; // 扫码时间*2

5
Aucma.Core.ProductOffLine/Models/TempInfo.cs
Unescape Escape View File

@ -129,5 +129,10 @@ namespace Aucma.Core.ProductOffLine.Models
/// 按型号统计使用的数量 /// 按型号统计使用的数量
/// </summary> /// </summary>
public int Count { get; set; } public int Count { get; set; }
/// <summary>
/// 扫码质检结果QualityResult
/// </summary>
///
public string QualityResult { get; set; }
} }
} }

35
Aucma.Core.ProductOffLine/ViewModels/DirectionEditViewModel.cs
Unescape Escape View File

@ -23,14 +23,13 @@ namespace Aucma.Core.ProductOffLine.ViewModels
{ {
public ICommand QueryCommand { get; set; } public ICommand QueryCommand { get; set; }
public RelayCommand<object> MouseClickCommand { get; set; } public RelayCommand<object> MouseClickCommand { get; set; }
public ICommand SaveCommand { get; set; }
private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
public DirectionEditViewModel() { public DirectionEditViewModel() {
_baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>(); _baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
QueryCommand = new RelayCommand(ExecuteQuery); QueryCommand = new RelayCommand(ExecuteQuery);
MouseClickCommand = new RelayCommand<object>(MouseClick); MouseClickCommand = new RelayCommand<object>(MouseClick);
SaveCommand = new RelayCommand(ExecuteSave);
Init(); Init();
} }
/// <summary> /// <summary>
@ -68,36 +67,6 @@ namespace Aucma.Core.ProductOffLine.ViewModels
} }
private async void ExecuteSave()
{
List<BaseMaterialInfo> list = new List<BaseMaterialInfo>();
// 处理保存按钮点击事件
foreach (DirectionEditModel item in MaterialDataGrid)
{
if ((!"A".Equals(item.SpaceCode) && !"B".Equals(item.SpaceCode)))
{
MessageBox.Show("产品编号:" + item.MaterialCode + " 产品型号:" + item.MaterialName + " 入库方向必须为A或B");
return;
}
list.Add(new BaseMaterialInfo()
{
ObjId = item.ObjId,
MaterialCode = item.MaterialCode,
MaterialName = item.MaterialName,
InboundDirection = item.SpaceCode,
MaterialType = "FERT"
});
}
bool result = await _baseMaterialInfoServices.UpdateAsync(list);
if(result)
{
MessageBox.Show("保存成功");
}
else
{
MessageBox.Show("保存失败");
}
}
#region 参数定义 #region 参数定义
private string _search = string.Empty; private string _search = string.Empty;
public string Search public string Search

2
Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -362,7 +362,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
{ {
Application.Current.Dispatcher.Invoke(() => Application.Current.Dispatcher.Invoke(() =>
{ {
ListItems.Add(new TempInfo() { No = ListItems.Count + 1, ProductOrderNo = record.ProductOrderNo, ProductSNCode = record.ProductSNCode, ProductModel = record.ProductModel, ProductRemark = record.ProductRemark, ProductScanTime = record.ProductScanTime }); ListItems.Add(new TempInfo() { No = ListItems.Count + 1, ProductOrderNo = record.ProductOrderNo, ProductSNCode = record.ProductSNCode, ProductModel = record.ProductModel, ProductRemark = record.ProductRemark, QualityResult = "成功", ProductScanTime = record.ProductScanTime });
}); });
} }

115
Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs
Unescape Escape View File

@ -30,19 +30,20 @@ namespace Aucma.Core.ProductOffLine.ViewModels
private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices; private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices;
private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
OffLineBusiness offLineBusiness = OffLineBusiness.Instance; OffLineBusiness offLineBusiness = OffLineBusiness.Instance;
private IndexPageView firstPage = new IndexPageView();//首页
private DirectionEditView directionEditView = new DirectionEditView();
private SelectQualityView selectQualityView = new SelectQualityView();
public QualityPageViewModel() public QualityPageViewModel()
{ {
// 手动模式默认A库 UserContent1 = directionEditView;
IsSelectedOptionA = true; UserContent2 = selectQualityView;
// 传入库方向 // 传入库方向
offLineBusiness.getDirectioneEvent += getInstoreDirection; offLineBusiness.getDirectioneEvent += getInstoreDirection;
QualityPageView.getAllQualityEvent += test; QualityPageView.getAllQualityEvent += test;
_baseQualityInspectionItemInfoServices = App.ServiceProvider.GetService<IBaseQualityInspectionItemInfoServices>(); _baseQualityInspectionItemInfoServices = App.ServiceProvider.GetService<IBaseQualityInspectionItemInfoServices>();
_baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>(); _baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
AutoDirectionCommand = new RelayCommand(DirectionEdit);
SelectQualityCommand = new RelayCommand(SelectQuality);
init(); init();
LoadData();
} }
@ -52,35 +53,50 @@ namespace Aucma.Core.ProductOffLine.ViewModels
/// <param name="materialType"></param> /// <param name="materialType"></param>
public String getInstoreDirection(string materialType) public String getInstoreDirection(string materialType)
{ {
string direction = string.Empty; string direction = string.Empty;
Application.Current.Dispatcher.Invoke(() => Application.Current.Dispatcher.Invoke(() =>
{ {
// 设置了入库模式 // 设置了入库自动模式模式
if (SelectedMaterialType != null && SelectedMaterialType.Content.ToString() == "手动模式") if (SelectedMaterialType != null && SelectedMaterialType.Content.ToString() == "自动模式")
{
// 获取手动方向
direction = IsSelectedOptionA == true ? "A" : "B";
}
else
{ {
// 未设置方向模式或者设置自动模式，默认自动
BaseMaterialInfo info = _baseMaterialInfoServices.Query(x => x.MaterialCode == materialType).FirstOrDefault(); BaseMaterialInfo info = _baseMaterialInfoServices.Query(x => x.MaterialCode == materialType).FirstOrDefault();
if (info != null) if (info != null&& !string.IsNullOrEmpty(info.InboundDirection)) // 设置过了方向
{ {
direction = info.InboundDirection; direction = info.InboundDirection;
} }
else // 自动模式未设置入库方向，默认为A
{ }
direction = "A"; else // 设置手动模式
} {
if (IsSelectedOptionA == true) direction = "A";
if (IsSelectedOptionB == true) direction = "B";
} }
}); });
return direction; return direction;
} }
#region 更换界面
public System.Windows.Controls.UserControl _content1;
public System.Windows.Controls.UserControl UserContent1
{
get => _content1;
set => SetProperty(ref _content1, value);
}
public System.Windows.Controls.UserControl _content2;
public System.Windows.Controls.UserControl UserContent2
{
get => _content2;
set => SetProperty(ref _content2, value);
}
#endregion
public async Task<List<BaseQualityInspectionItemInfo>> test() public async Task<List<BaseQualityInspectionItemInfo>> test()
{ {
List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoServices.query(); List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoServices.query();
@ -91,30 +107,17 @@ namespace Aucma.Core.ProductOffLine.ViewModels
public async void init() public async void init()
{ {
await _baseQualityInspectionItemInfoServices.query(); await _baseQualityInspectionItemInfoServices.query();
//Task.Run(() =>
//{
// Thread.Sleep(5000);
// string A = getInstoreDirection("9001001802");
// Console.WriteLine(A);
//});
} }
List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>(); List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>();
#region 参数定义 #region 参数定义
/// <summary>
/// 自动方向设置
/// </summary>
public RelayCommand AutoDirectionCommand { get; set; }
private void DirectionEdit()
{
DirectionEditView directionEditView = new DirectionEditView();
directionEditView.ShowDialog();
}
/// <summary>
/// 质检项目设置
/// </summary>
public RelayCommand SelectQualityCommand { get; set; }
private void SelectQuality()
{
SelectQualityView selectQualityView = new SelectQualityView();
selectQualityView.ShowDialog();
}
/// <summary> /// <summary>
/// 分垛模式(自动模式，手动模式)SelectedMaterialType.content.tostring() /// 分垛模式(自动模式，手动模式)SelectedMaterialType.content.tostring()
@ -175,42 +178,10 @@ namespace Aucma.Core.ProductOffLine.ViewModels
} }
#endregion #endregion
#region 初始化datagrid
private ObservableCollection<MaterialComplateInfo> materialDataGrid = new ObservableCollection<MaterialComplateInfo>();
public ObservableCollection<MaterialComplateInfo> MaterialDataGrid
{
get { return materialDataGrid; }
set
{
materialDataGrid = value;
OnPropertyChanged();//属性通知
}
}
#endregion
#endregion #endregion
#region 加载DataGrid数据
private async void LoadData()
{
//Task.Run(() =>
//{
// Thread.Sleep(5000);
// getInstoreDirection("9000004529");
//});
//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 查询 #region 查询
/// <summary> /// <summary>

37
Aucma.Core.ProductOffLine/ViewModels/SelectQualityViewModel.cs
Unescape Escape View File

@ -30,7 +30,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
public ICommand QueryCommand { get; set; } public ICommand QueryCommand { get; set; }
public RelayCommand<object> MouseClickCommand { get; set; } public RelayCommand<object> MouseClickCommand { get; set; }
public ICommand SaveCommand { get; set; }
private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices; private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices;
public SelectQualityViewModel() public SelectQualityViewModel()
@ -39,8 +39,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
QueryCommand = new RelayCommand(ExecuteQuery); QueryCommand = new RelayCommand(ExecuteQuery);
MouseClickCommand = new RelayCommand<object>(MouseClick); MouseClickCommand = new RelayCommand<object>(MouseClick);
SaveCommand = new RelayCommand(ExecuteSave);
Init(); Init();
} }
@ -74,38 +73,6 @@ namespace Aucma.Core.ProductOffLine.ViewModels
} }
private async void ExecuteSave()
{
List<BaseQualityInspectionItemInfo> list = new List<BaseQualityInspectionItemInfo>();
// 处理保存按钮点击事件
foreach (QualityInspectionModel item in qualityItemGrid)
{
if ((!"是".Equals(item.IsInSpection) && !"否".Equals(item.IsInSpection)))
{
MessageBox.Show("质检编号:" + item.QualityDefectCode + " 质检名称:" + item.QualityDefectName + " 是否质检应该是或者否");
return;
}
list.Add(new BaseQualityInspectionItemInfo()
{
ObjId = item.ObjId,
QualityDefectCode = item.QualityDefectCode,
QualityDefectName = item.QualityDefectName,
ParentId = "0",
IsFlag = 0,
IsInSpection = item.IsInSpection == "是" ? "1" : "0"
});
}
bool result = await _baseQualityInspectionItemInfoServices.UpdateAsync(list);
if (result)
{
MessageBox.Show("保存成功");
}
else
{
MessageBox.Show("保存失败");
}
}
private QualityInspectionModel selectedDataItem; private QualityInspectionModel selectedDataItem;

128
Aucma.Core.ProductOffLine/Views/DirectionEditView.xaml
Unescape Escape View File

@ -1,20 +1,96 @@
<Window x:Class="Aucma.Core.ProductOffLine.Views.DirectionEditView" <UserControl x:Class="Aucma.Core.ProductOffLine.Views.DirectionEditView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d" mc:Ignorable="d" FontFamily="Microsoft YaHei"
Title="自动方向设置" Height="650" Width="900" Name="window" Background="White" Name="window" Background="Transparent" d:DesignHeight="800" d:DesignWidth="600">
ResizeMode="NoResize" Topmost="True" <UserControl.Resources>
> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="20"/>
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="#dddddd"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type Slider}">
<Style.Resources>
<!-- 重写重复触发按钮的样式 -->
<Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
<Setter Property="Focusable" Value="false" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Padding" Value="0" />
<Setter Property="Width" Value="30" />
</Style>
</Style.Resources>
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
<Setter Property="SmallChange" Value="1" />
<!-- 重写Slider的模板 -->
</Style>
<Style TargetType="{x:Type DatePickerTextBox}">
<Setter Property="Background" Value="#0288d1" />
</Style>
</UserControl.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect> <Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect> <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect> </Border.Effect>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="87*"/>
<ColumnDefinition Width="803*"/> <ColumnDefinition Width="803*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -24,35 +100,21 @@
<StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="2"> <StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="2">
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/> <TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="#FFFFFF" VerticalAlignment="Center" FontSize="15"/>
<Button Content="查 询" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" /> <Button Content="查 询" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" />
<Button Content="保 存" Command="{Binding SaveCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" Margin="50 0 0 0"/>
</StackPanel> </StackPanel>
<!--计划列表--> <!--计划列表-->
<Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="2"> <Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="2">
<DataGrid Name="dataGrid" ItemsSource="{Binding MaterialDataGrid}" Background="Transparent" <DataGrid Name="dataGrid" ItemsSource="{Binding MaterialDataGrid}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
FontSize="15" ColumnHeaderHeight="35" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" Foreground="White" SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" SelectionMode="Single" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编码" Width="2*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编码" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="2*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库方向" Width="*" IsReadOnly="True" /> <DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库方向" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Border> </Border>
@ -60,4 +122,4 @@
</Grid> </Grid>
</Border> </Border>
</Window> </UserControl>

3
Aucma.Core.ProductOffLine/Views/DirectionEditView.xaml.cs
Unescape Escape View File

@ -1,5 +1,6 @@
using Aucma.Core.ProductOffLine.ViewModels; using Aucma.Core.ProductOffLine.ViewModels;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
namespace Aucma.Core.ProductOffLine.Views namespace Aucma.Core.ProductOffLine.Views
@ -7,7 +8,7 @@ namespace Aucma.Core.ProductOffLine.Views
/// <summary> /// <summary>
/// Interaction logic for MainWindow.xaml /// Interaction logic for MainWindow.xaml
/// </summary> /// </summary>
public partial class DirectionEditView : Window public partial class DirectionEditView : UserControl
{ {
private DirectionEditViewModel directionEditViewModel = new DirectionEditViewModel(); private DirectionEditViewModel directionEditViewModel = new DirectionEditViewModel();
public DirectionEditView() public DirectionEditView()

2
Aucma.Core.ProductOffLine/Views/DirectionItemWindow.xaml
Unescape Escape View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
mc:Ignorable="d" mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei"
Title="选择方向" Height="500" Width="500" Name="window" Background="White" Title="选择方向" Height="500" Width="500" Name="window" Background="White"
ResizeMode="NoResize" Topmost="True"> ResizeMode="NoResize" Topmost="True">
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">

53
Aucma.Core.ProductOffLine/Views/IndexPageView.xaml
Unescape Escape View File

@ -5,11 +5,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
mc:Ignorable="d" mc:Ignorable="d" FontFamily="Microsoft YaHei"
d:DesignHeight="800" d:DesignHeight="800"
d:DesignWidth="1000" > d:DesignWidth="1000" >
<UserControl.Resources> <UserControl.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="20"/>
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</Style> </Style>
@ -155,70 +156,69 @@
<ColumnDefinition Width="1.2*"/> <ColumnDefinition Width="1.2*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="1.2*"/> <ColumnDefinition Width="1.2*"/>
<ColumnDefinition/> <ColumnDefinition Width="0.8*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Row="0" Grid.Column="0" Background="#1157b9"> <Border Grid.Row="0" Grid.Column="0" Background="#1157b9">
<TextBlock Text="当前工位" Foreground="White"/> <TextBlock Text="当前工位" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="1" Grid.RowSpan="3" Grid.Column="0" Background="#1157b9"> <Border Grid.Row="1" Grid.RowSpan="3" Grid.Column="0" Background="#1157b9">
<TextBlock Text="成品下线" Foreground="White" FontWeight="Bold" FontSize="25"/> <TextBlock Text="成品下线" Foreground="White" FontWeight="Bold" FontSize="30"/>
</Border> </Border>
<Border Grid.Row="0" Grid.Column="1" Background="#1157b9"> <Border Grid.Row="0" Grid.Column="1" Background="#1157b9">
<TextBlock Text="产品条码" Foreground="White" /> <TextBlock Text="产品条码" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="0" Grid.Column="2"> <Border Grid.Row="0" Grid.Column="2">
<TextBlock Text="{Binding ProductSNCode}" Foreground="White"/> <TextBlock Text="{Binding ProductSNCode}" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="0" Grid.Column="3" Background="#1157b9"> <Border Grid.Row="0" Grid.Column="3" Background="#1157b9">
<TextBlock Text="扫描时间" Foreground="White" /> <TextBlock Text="扫描时间" Foreground="White" FontSize="20" />
</Border> </Border>
<Border Grid.Row="0" Grid.Column="4"> <Border Grid.Row="0" Grid.Column="4">
<TextBlock Text="{Binding ProductScanTime}" Foreground="White"/> <TextBlock Text="{Binding ProductScanTime}" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="1" Grid.Column="1" Background="#1157b9"> <Border Grid.Row="1" Grid.Column="1" Background="#1157b9">
<TextBlock Text="产品型号" Foreground="White" /> <TextBlock Text="产品型号" Foreground="White" FontSize="20" />
</Border> </Border>
<Border Grid.Row="1" Grid.Column="2"> <Border Grid.Row="1" Grid.Column="2">
<TextBlock Text="{Binding ProductModel}" Foreground="White"/> <TextBlock Text="{Binding ProductModel}" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="1" Grid.Column="3" Background="#1157b9"> <Border Grid.Row="1" Grid.Column="3" Background="#1157b9">
<TextBlock Text="订单编号" Foreground="White" /> <TextBlock Text="订单编号" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="1" Grid.Column="4"> <Border Grid.Row="1" Grid.Column="4">
<TextBlock Text="{Binding ProductOrderNo}" Foreground="White"/> <TextBlock Text="{Binding ProductOrderNo}" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="2" Grid.Column="1" Background="#1157b9"> <Border Grid.Row="2" Grid.Column="1" Background="#1157b9">
<TextBlock Text="订单数量" Foreground="White" /> <TextBlock Text="订单数量" Foreground="White" FontSize="20" />
</Border> </Border>
<Border Grid.Row="2" Grid.Column="2"> <Border Grid.Row="2" Grid.Column="2">
<TextBlock Text="{Binding OrderQty}" Foreground="White"/> <TextBlock Text="{Binding OrderQty}" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="2" Grid.Column="3" Background="#1157b9"> <Border Grid.Row="2" Grid.Column="3" Background="#1157b9">
<TextBlock Text="订单已上传" Foreground="White" /> <TextBlock Text="订单已上传" Foreground="White" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="2" Grid.Column="4"> <Border Grid.Row="2" Grid.Column="4">
<TextBlock Text="{Binding ActQty}" Foreground="White"/> <TextBlock Text="{Binding ActQty}" Foreground="White"/>
</Border> </Border>
<Border Grid.Row="3" Grid.Column="1" Background="#1157b9"> <Border Grid.Row="3" Grid.Column="1" Background="#1157b9">
<TextBlock Text="提示信息" Foreground="White" /> <TextBlock Text="提示信息" Foreground="White" FontSize="20" />
</Border> </Border>
<Border Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3"> <Border Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3">
<TextBlock Text="{Binding MsgInfo}" Foreground="{Binding MsgColor}"/> <TextBlock Text="{Binding MsgInfo}" Foreground="{Binding MsgColor}" FontSize="20"/>
</Border> </Border>
<Border Grid.Row="0" Grid.Column="5" Background="#1157b9"> <Border Grid.Row="0" Grid.Column="5" Background="#1157b9">
<TextBlock Text="下线产量" Foreground="White" /> <TextBlock Text="下线产量" Foreground="White" FontSize="20" />
</Border> </Border>
<Border Grid.Row="1" Grid.RowSpan="2" Grid.Column="5" Height="78" VerticalAlignment="Top"> <Border Grid.Row="1" Grid.RowSpan="2" Grid.Column="5" Height="78" VerticalAlignment="Top">
<TextBlock Text="255" Foreground="White" FontSize="40"/> <TextBlock Text="1225" Foreground="White" FontSize="70"/>
</Border> </Border>
<Border Grid.Row="3" Grid.Column="5" Height="39" VerticalAlignment="Center"> <Border Grid.Row="3" Grid.Column="5" Height="39" VerticalAlignment="Center">
<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<RadioButton Content="A库" Margin="5 0" Foreground="White"/> <RadioButton Content="A库" Margin="5 0" Foreground="White"/>
<RadioButton Content="B库" Margin="5 0" Foreground="White" /> <RadioButton Content="B库" Margin="5 0" Foreground="White" />
</WrapPanel> </WrapPanel>
</Border> </Border>
</Grid> </Grid>
</Border> </Border>
@ -241,7 +241,7 @@
<RowDefinition Height="9*"/> <RowDefinition Height="9*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" > <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
<TextBlock Text="当日小时产量统计" FontSize="15" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="当日小时产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" > <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" > <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" >
@ -273,7 +273,7 @@
<RowDefinition Height="9*"/> <RowDefinition Height="9*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" > <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
<TextBlock Text="当日型号产量统计" FontSize="15" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="当日型号产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" > <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5"> <lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5">
@ -300,17 +300,18 @@
</Grid> </Grid>
</Border> </Border>
<Border Grid.Row="2"> <Border Grid.Row="2">
<DataGrid Grid.Row="0" ItemsSource="{Binding ListItems}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" <DataGrid Grid.Row="0" ItemsSource="{Binding ListItems}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" > Foreground="White" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductOrderNo}" Header="订单编号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding ProductOrderNo}" Header="订单编号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductSNCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding ProductSNCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ProductRemark}" Header="特征信息" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding ProductRemark}" Header="特征信息" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding QualityResult}" Header="质检结果" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductScanTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding ProductScanTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns> </DataGrid.Columns>

30
Aucma.Core.ProductOffLine/Views/MainWindow.xaml
Unescape Escape View File

@ -5,7 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d" mc:Ignorable="d"
Title="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" Title="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowState="Maximized" WindowStyle="SingleBorderWindow" ResizeMode="CanResize"> WindowState="Maximized" WindowStyle="SingleBorderWindow" ResizeMode="CanResize">
<Window.Background> <Window.Background>
<ImageBrush ImageSource="/Assets/images/background.jpg" /> <ImageBrush ImageSource="/Assets/images/background.jpg" />
@ -16,11 +17,11 @@
</Border.Effect> </Border.Effect>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="0.5*"/>
<RowDefinition Height="6*"/> <RowDefinition Height="6*"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2"> <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2" Height="100">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
@ -28,10 +29,11 @@
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"> <DockPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
<TextBlock Text="澳柯玛成品下线系统" FontSize="50" Foreground="White" FontWeight="Bold"/> <StackPanel HorizontalAlignment="Center" Margin="0 3 0 0" Height="100" >
</StackPanel> <TextBlock Text="澳柯玛成品下线系统" Margin="0" Foreground="White" FontWeight="Bold" FontSize="42" HorizontalAlignment="Center" VerticalAlignment="Center" />
</StackPanel>
</DockPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right"> <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -53,19 +55,19 @@
</Border> </Border>
<DockPanel Grid.Row="2" Margin="5 0 5 3"> <DockPanel Grid.Row="2" Margin="5 0 5 3">
<Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"> <Border Margin="5" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left"> <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="FirstPage" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" Margin="5 0" Height="40" />
<Button Content="任务记录" x:Name="RecordPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RecordPage}" /> <Button Content="任务记录" x:Name="RecordPage" Margin="5 0" Height="40" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RecordPage}" />
<Button Content="质检分垛" x:Name="QualityPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=QualityPage}" /> <Button Content="质检分垛" x:Name="QualityPage" Margin="5 0" Height="40" 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="TabTip" Margin="5 0" Height="40" 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="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Margin="5 0" Height="40" Background="#FF9900" BorderBrush="#FF9900" />
<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"/> <Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Margin="5 0" Height="40" Background="#FF0033" BorderBrush="#FF0033"/>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2" Height="50" Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Grid.Row="2" Height="50" Orientation="Horizontal" HorizontalAlignment="Right">
<Border Width="30" Height="30" CornerRadius="15"> <Border Width="30" Height="30" CornerRadius="15">

83
Aucma.Core.ProductOffLine/Views/QualityPageView.xaml
Unescape Escape View File

@ -6,8 +6,8 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
xmlns:cvt="clr-namespace:Aucma.Core.ProductOffLine.ConvertTo" xmlns:cvt="clr-namespace:Aucma.Core.ProductOffLine.ConvertTo"
mc:Ignorable="d" mc:Ignorable="d" Background="#1152AC"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="1080" d:DesignWidth="1920">
<UserControl.Resources> <UserControl.Resources>
<cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter> <cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
@ -49,77 +49,48 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Border Grid.Row="0" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="9*"/> <RowDefinition Height="9*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0"> <Grid.ColumnDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" > <ColumnDefinition Width="*"/>
<TextBlock Text="基本配置" FontSize="40" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <ColumnDefinition Width="*"/>
</Border> </Grid.ColumnDefinitions>
</Grid> <Border Grid.Row="0" Grid.Column="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
<TextBlock Text="入库设置" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="0" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
<TextBlock Text="质检设置" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="分垛模式选择:" Margin="10 0" Foreground="White" FontSize="30" VerticalAlignment="Center"/> <TextBlock Text="分垛模式选择:" Margin="10 0" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<!--<ComboBox Width="100" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="15" Foreground="White">
<ComboBoxItem Content="手动模式" Foreground="Blue" />
<ComboBoxItem Content="自动模式" Foreground="Blue"/>
</ComboBox>-->
<ComboBox SelectedItem="{Binding SelectedMaterialType}" Width="200" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="30" Foreground="White"> <ComboBox SelectedItem="{Binding SelectedMaterialType}" Width="200" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="30" Foreground="White">
<ComboBoxItem Content="自动模式" Foreground="Blue"/> <ComboBoxItem Content="自动模式" Foreground="Blue"/>
<ComboBoxItem Content="手动模式" Foreground="Blue" /> <ComboBoxItem Content="手动模式" Foreground="Blue" />
</ComboBox> </ComboBox>
<Border Margin="100 0 0 0"> <Border Margin="100 0 0 0">
<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="手动方向设置: " Foreground="White" FontSize="30" VerticalAlignment="Center"/> <TextBlock Text="手动方向设置: " Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<RadioButton Content="A" FontSize="30" GroupName="Direction" IsChecked="{Binding IsSelectedOptionA, Mode=TwoWay}" /> <RadioButton Content="A" FontSize="20" GroupName="Direction" IsChecked="{Binding IsSelectedOptionA, Mode=TwoWay}" />
<RadioButton Content="B" FontSize="30" GroupName="Direction" IsChecked="{Binding IsSelectedOptionB, Mode=TwoWay}" Margin="10 0 0 0"/> <RadioButton Content="B" FontSize="20" GroupName="Direction" IsChecked="{Binding IsSelectedOptionB, Mode=TwoWay}" Margin="10 0 0 0"/>
</WrapPanel> </WrapPanel>
</Border> </Border>
<Button Content="自动方向设置" Command="{Binding AutoDirectionCommand}" FontSize="25" Margin="100,0,0,0" Background="Blue" Foreground="White" Height="50"/>
<Button Content="质检项设置" Command="{Binding SelectQualityCommand}" FontSize="25" Margin="50,0,0,0" Background="Blue" Foreground="White" Height="50"/>
</WrapPanel> </WrapPanel>
</Grid> </Grid>
<Grid Grid.Row="2"> <Border Grid.Row="2" Grid.Column="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,1,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" > <ContentControl Content="{Binding UserContent1}"/>
<TextBlock Text="质检数据" FontSize="40" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> </Border>
</Border> <Border Grid.Row="2" Grid.Column="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" >
</Grid> <ContentControl Content="{Binding UserContent2}"/>
<Grid Grid.Row="3"> </Border>
<DataGrid Name="qualityGrid" ItemsSource="{Binding QualityDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" >
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品条码" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品名称" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn x:Name="quality1" Binding="{Binding MaterialCode}" Header="内胆预装检漏" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn x:Name="quality2" Binding="{Binding MaterialName}" Header="成品检漏" Width="2*" IsReadOnly="True"/>
<DataGridTextColumn x:Name="quality3" Binding="{Binding SpaceCode}" Header="终检" Width="*" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
</Grid> </Grid>
</Border> </Border>

21
Aucma.Core.ProductOffLine/Views/QualityPageView.xaml.cs
Unescape Escape View File

@ -34,27 +34,10 @@ namespace Aucma.Core.ProductOffLine.Views
InitializeComponent(); InitializeComponent();
QualityPageViewModel viewmodel = new QualityPageViewModel(); QualityPageViewModel viewmodel = new QualityPageViewModel();
this.DataContext = viewmodel; this.DataContext = viewmodel;
qualityItem();
} }
public async void qualityItem()
{
List<BaseQualityInspectionItemInfo> list = await getAllQualityEvent?.Invoke();
foreach (BaseQualityInspectionItemInfo item in list)
{
foreach (var column in qualityGrid.Columns)
{
DataGridColumn dataGridColumn = column as DataGridColumn;
if (dataGridColumn.Header.ToString().Equals(item.QualityDefectName) && "0".Equals(item.IsInSpection))
{
dataGridColumn.Visibility = Visibility.Collapsed;
}
}
}
// this.quality1.Visibility = Visibility.Collapsed;
}
} }
} }

2
Aucma.Core.ProductOffLine/Views/QualityWindow.xaml
Unescape Escape View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
mc:Ignorable="d" mc:Ignorable="d" WindowStartupLocation="CenterScreen"
Title="选择方向" Height="500" Width="500" Name="window" Background="White" Title="选择方向" Height="500" Width="500" Name="window" Background="White"
ResizeMode="NoResize" Topmost="True"> ResizeMode="NoResize" Topmost="True">
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">

129
Aucma.Core.ProductOffLine/Views/SelectQualityView.xaml
Unescape Escape View File

@ -1,54 +1,121 @@
<Window x:Class="Aucma.Core.ProductOffLine.Views.SelectQualityView" <UserControl x:Class="Aucma.Core.ProductOffLine.Views.SelectQualityView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
mc:Ignorable="d" Title="质检项目设置" Height="650" Width="600" Name="window" Background="White" ResizeMode="NoResize" Topmost="True" mc:Ignorable="d" Background="Transparent" FontFamily="Microsoft YaHei"
> d:DesignHeight="800" d:DesignWidth="400" >
<UserControl.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="20"/>
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="#dddddd"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type Slider}">
<Style.Resources>
<!-- 重写重复触发按钮的样式 -->
<Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
<Setter Property="Focusable" Value="false" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Padding" Value="0" />
<Setter Property="Width" Value="30" />
</Style>
</Style.Resources>
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
<Setter Property="SmallChange" Value="1" />
<!-- 重写Slider的模板 -->
</Style>
<Style TargetType="{x:Type DatePickerTextBox}">
<Setter Property="Background" Value="#0288d1" />
</Style>
</UserControl.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="10"> <Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect> <Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect> <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect> </Border.Effect>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="31*"/>
<ColumnDefinition Width="8*"/> <ColumnDefinition Width="22*"/>
<ColumnDefinition Width="103*"/>
<ColumnDefinition Width="125*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="2"> <StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="3">
<Button Content="刷 新" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" /> <Button Content="刷 新" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" />
<Button Content="保 存" Command="{Binding SaveCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" Margin="50 0 0 0"/>
</StackPanel> </StackPanel>
<!--计划列表--> <!--计划列表-->
<Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="2"> <Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="4">
<DataGrid Name="qualityItemGrid" ItemsSource="{Binding QualityItemGrid}" Background="Transparent" <DataGrid Name="qualityItemGrid" ItemsSource="{Binding QualityItemGrid}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
FontSize="15" ColumnHeaderHeight="35" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" Foreground="White" SelectedItem="{Binding SelectedDataItem}" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" SelectionMode="Single" MouseLeftButtonDown="dataGrid_MouseLeftButtonDown">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding QualityDefectCode}" Header="质检编号" Width="2*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding QualityDefectCode}" Header="质检编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding QualityDefectName}" Header="质检名称" Width="2*" IsReadOnly="True"/> <DataGridTextColumn Binding="{Binding QualityDefectName}" Header="质检名称" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn x:Name="test11" Binding="{Binding IsInSpection}" Header="是否校验" Width="*" /> <DataGridTextColumn x:Name="test11" Binding="{Binding IsInSpection}" Header="是否校验" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<!--<DataGridTemplateColumn.CellTemplate> <!--<DataGridTemplateColumn.CellTemplate>
@ -75,4 +142,4 @@
</Grid> </Grid>
</Border> </Border>
</Window> </UserControl>

2
Aucma.Core.ProductOffLine/Views/SelectQualityView.xaml.cs
Unescape Escape View File

@ -25,7 +25,7 @@ namespace Aucma.Core.ProductOffLine.Views
/// <summary> /// <summary>
/// SelectQuality.xaml 的交互逻辑 /// SelectQuality.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class SelectQualityView : Window public partial class SelectQualityView : System.Windows.Controls.UserControl
{ {
private SelectQualityViewModel selectQualityViewModel = new SelectQualityViewModel(); private SelectQualityViewModel selectQualityViewModel = new SelectQualityViewModel();
public SelectQualityView() public SelectQualityView()

142
Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml
Unescape Escape View File

@ -6,12 +6,33 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views" xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
xmlns:cvt="clr-namespace:Aucma.Core.ProductOffLine.ConvertTo" xmlns:cvt="clr-namespace:Aucma.Core.ProductOffLine.ConvertTo"
mc:Ignorable="d" mc:Ignorable="d" FontFamily="Microsoft YaHei" Background="#1152AC"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources> <UserControl.Resources>
<cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter> <cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="18"/>
</Style>
<Style TargetType="DataGrid">
<!--网格线颜色-->
<Setter Property="CanUserResizeColumns" Value="false"/>
<Setter Property="Background" Value="#1152AC" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#4285DE"/>
</Setter.Value>
</Setter>
<Setter Property="VerticalGridLinesBrush">
<Setter.Value>
<SolidColorBrush Color="#1152AC"/>
</Setter.Value>
</Setter>
</Style>
<!--列头标题栏样式--> <!--列头标题栏样式-->
<Style TargetType="DataGridColumnHeader"> <Style TargetType="DataGridColumnHeader">
<!--<Setter Property="HorizontalContentAlignment" Value="Center"/> <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
@ -19,12 +40,40 @@
<!--<Setter Property="Background" Value="#dddddd"/> <!--<Setter Property="Background" Value="#dddddd"/>
<Setter Property="Foreground" Value="Black"/>--> <Setter Property="Foreground" Value="Black"/>-->
<!--<Setter Property="BorderThickness" Value="1" />--> <!--<Setter Property="BorderThickness" Value="1" />-->
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#dddddd" /> <Setter Property="BorderBrush" Value="#dddddd" />
<Setter Property="Height" Value="30"/> <Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
</Style> </Style>
<!--单元格样式-->
<Style TargetType="DataGridCell">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid Background="{TemplateBinding Background}" >
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="#dddddd"/>
</Trigger>
</Style.Triggers>
</Style>
</UserControl.Resources> </UserControl.Resources>
<Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5"> <Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="5">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -35,8 +84,8 @@
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" > <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"/> <TextBlock Text="扫描记录" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </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" Click="btn1_Click" /> <Button x:Name="btn1" Content="入库记录" HorizontalAlignment="Left" Margin="37,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF1752E1" Click="btn1_Click" FontSize="20"/>
<Button x:Name="btn2" Content="型号汇总" HorizontalAlignment="Left" Margin="135,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" Click="btn2_Click" /> <Button x:Name="btn2" Content="型号汇总" HorizontalAlignment="Left" Margin="170,13,0,0" Grid.Row="1" VerticalAlignment="Top" RenderTransformOrigin="0.204,0.551" Background="#FF384E83" Click="btn2_Click" FontSize="20"/>
<Border x:Name="border1" Grid.Row="1" Visibility="Visible" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,50,5,5"> <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 Margin="10,5">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -44,12 +93,11 @@
<RowDefinition Height="8*"/> <RowDefinition Height="8*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center"> <WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="15" VerticalAlignment="Center"/> <TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<DatePicker <DatePicker
x:Name="BeginTime" Foreground="DarkBlue" x:Name="BeginTime" FontSize="16"
Width="200" Margin="10 0" Text="2023-10-09" Width="200" Margin="10 0" BorderBrush="White"
materialDesign:CalendarAssist.IsHeaderVisible="False" materialDesign:CalendarAssist.IsHeaderVisible="False">
materialDesign:HintAssist.Hint="开始日期">
<DatePicker.SelectedDate> <DatePicker.SelectedDate>
<Binding <Binding
Path="FutureValidatingDate" Path="FutureValidatingDate"
@ -60,12 +108,11 @@
</DatePicker.SelectedDate> </DatePicker.SelectedDate>
</DatePicker> </DatePicker>
<TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="15" VerticalAlignment="Center"/> <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<DatePicker <DatePicker
x:Name="EndTime" Margin="10 0" Text="2023-10-09" x:Name="EndTime" Margin="10 0"
Width="200" Foreground="DarkBlue" Width="200" BorderBrush="White" FontSize="16"
materialDesign:CalendarAssist.IsHeaderVisible="False" materialDesign:CalendarAssist.IsHeaderVisible="False">
materialDesign:HintAssist.Hint="结束日期">
<DatePicker.SelectedDate> <DatePicker.SelectedDate>
<Binding <Binding
Path="FutureValidatingDate" Path="FutureValidatingDate"
@ -89,35 +136,20 @@
</Button> </Button>
</WrapPanel> </WrapPanel>
<UniformGrid Grid.Row="1"> <UniformGrid Grid.Row="1">
<DataGrid Grid.Row="0" ItemsSource="{Binding ListItems}" Background="Transparent" <DataGrid Grid.Row="0" ItemsSource="{Binding ListItems}" Background="#00000000"
ColumnHeaderHeight="35" ColumnHeaderHeight="35"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" > Foreground="White" >
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" />
<DataGridTextColumn Binding="{Binding ProductOrderNo}" Header="订单编号" Width="3*" />
<DataGridTextColumn Binding="{Binding ProductSNCode}" Header="产品条码" Width="3*" />
<DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" />
<DataGridTextColumn Binding="{Binding ProductRemark}" Header="特征信息" Width="3*" />
<DataGridTextColumn Binding="{Binding ProductScanTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*"/>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductOrderNo}" Header="订单编号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductSNCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductRemark}" Header="特征信息" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductScanTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="扫描时间" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</UniformGrid> </UniformGrid>
@ -130,32 +162,18 @@
</Grid.RowDefinitions>--> </Grid.RowDefinitions>-->
<UniformGrid Grid.Row="1"> <UniformGrid Grid.Row="1">
<DataGrid Grid.Row="0" ItemsSource="{Binding TotalItem}" Background="Transparent" <DataGrid Grid.Row="0" ItemsSource="{Binding TotalItem}" Background="#00000000"
ColumnHeaderHeight="35" ColumnHeaderHeight="35"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" > Foreground="White" >
<!-- 表头剧中-->
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center">
</Setter>
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" /> <DataGridTextColumn Binding="{Binding No}" Header="序号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ProductCode}" Header="物料编码" Width="3*" /> <DataGridTextColumn Binding="{Binding ProductCode}" Header="物料编码" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" /> <DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ProductRemark}" Header="标签特征" Width="3*" /> <DataGridTextColumn Binding="{Binding ProductRemark}" Header="标签特征" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding Count}" Header="产品数量" Width="3*" /> <DataGridTextColumn Binding="{Binding Count}" Header="产品数量" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>

Write Preview
Loading…
Cancel
Save