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

change - 调整条码绑定界面

Browse Source
dev
liuwf 1 year ago
parent 2ce12dd9f9
commit 43cf594ffe
4 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File

68
Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -60,13 +60,13 @@ namespace Aucma.Core.CodeBinding.ViewModels
{
// 赋值
Code1 = "B236000007811023002";
Code1Time = "2023-10-23 16:05:23";
// Code1Time = "2023-10-23 16:05:23";
Code2 = "B236000007811023002";
Code2Time = "2023-10-23 16:05:23";
// Code2Time = "2023-10-23 16:05:23";
BindingInfo = "条码[B236000007811023002]和SN条码[B236000007811023002]绑定成功!";
LoadCharts();
List<CodeBindingRecord> records = null;
records = await _codeBindingRecordServices.QueryAsync(x => x.BoxCode != null && x.RecordTime2 >= System.DateTime.Now.AddDays(-3), "RECORD_TIME1 desc");
records = await _codeBindingRecordServices.QueryAsync(x => x.BoxCode != null && x.RecordTime2 >= System.DateTime.Now.AddDays(-1), "RECORD_TIME1 desc");
if (records != null)
{
foreach (CodeBindingRecord record in records)
@ -80,7 +80,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
}
}
// 之后修改为统计近一天或者几天
// 修改为统计近一天
private async void LoadCharts()
{
List<CodeBindCharts> list = await _codeBindingRecordServices.QueryCharts();
@ -100,6 +100,8 @@ namespace Aucma.Core.CodeBinding.ViewModels
column.Foreground = Brushes.White;
ModelStatistics.Add(column);
ProductionHourList = chartList;
}
// 测试方法
private async void add()
@ -127,20 +129,20 @@ namespace Aucma.Core.CodeBinding.ViewModels
}
}
/// <summary>
/// 条码1扫描时间
/// </summary>
private string code1Time = string.Empty;
public string Code1Time
{
get { return code1Time; }
set
{
code1Time = value;
OnPropertyChanged(nameof(Code1Time));
}
}
///// <summary>
///// 条码1扫描时间
///// </summary>
//private string code1Time = string.Empty;
//public string Code1Time
//{
// get { return code1Time; }
// set
// {
// code1Time = value;
// OnPropertyChanged(nameof(Code1Time));
// }
//}
/// <summary>
/// 条码2
/// </summary>
@ -154,19 +156,19 @@ namespace Aucma.Core.CodeBinding.ViewModels
OnPropertyChanged(nameof(Code2));
}
}
/// <summary>
/// 条码2扫描时间
/// </summary>
private string code2Time = string.Empty;
public string Code2Time
{
get { return code2Time; }
set
{
code2Time = value;
OnPropertyChanged(nameof(Code2Time));
}
}
///// <summary>
///// 条码2扫描时间
///// </summary>
//private string code2Time = string.Empty;
//public string Code2Time
//{
// get { return code2Time; }
// set
// {
// code2Time = value;
// OnPropertyChanged(nameof(Code2Time));
// }
//}
/// <summary>
/// 绑定提示信息
/// </summary>
@ -228,7 +230,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
private void RefreshCode1(string code1, string time)
{
Code1 = code1;
Code1Time = time;
// Code1Time = time;
}
/// <summary>
@ -238,7 +240,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
private void RefreshCode2(CodeBindingRecord record)
{
Code2 = record.ProductCode;
Code2Time = record.RecordTime2.ToString();
// Code2Time = record.RecordTime2.ToString();
if ("成功".Equals(record.BindingResult))
{
BindingInfo = "条码【" + record.BoxCode + "】与SN码【" + record.ProductCode + "】绑定成功";

2
Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs
Unescape Escape View File

@ -34,7 +34,7 @@ namespace Aucma.Core.CodeBinding.ViewModels
{
List<CodeBindingRecord> records = null;
records = await _codeBindingRecordServices.QueryAsync(x => x.BoxCode != null, "RECORD_TIME1 desc");
records = await _codeBindingRecordServices.QueryAsync(x => x.BoxCode != null && x.RecordTime2 >= System.DateTime.Now.AddDays(-1), "RECORD_TIME1 desc");
if (records != null)
{
foreach (CodeBindingRecord record in records)

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

@ -40,27 +40,23 @@
<RowDefinition/>
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Label Content="条码信息 " FontSize="15" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code1}" Width="200" FontSize="15" Foreground="#FFFFFF"/>
<!--Text="{Binding Code1}"-->
<TextBox Text="{Binding Code1Time}" Width="200" Foreground="#FFFFFF" />
<!--Text="{Binding Code1Time}"-->
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50 0 0 0 ">
<Label Content="MES条码 " FontSize="20" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code1}" Width="350" FontSize="20" Foreground="#FFFFFF"/>
<Label Content="订单号 " FontSize="20" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code1}" Width="300" FontSize="20" Foreground="#FFFFFF"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Label Content="SN码信息 " FontSize="15" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code2}" Width="200" FontSize="15" Foreground="#FFFFFF"/>
<!--Text="{Binding Code2}"-->
<TextBox Text="{Binding Code2Time}" Width="200" Foreground="#FFFFFF"/>
<!--Text="{Binding Code2Time}"-->
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50 0 0 0 ">
<Label Content="成品条码 " FontSize="20" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code2}" Width="350" FontSize="20" Foreground="#FFFFFF"/>
<Label Content="型号 " FontSize="20" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding Code2}" Width="300" FontSize="20" Foreground="#FFFFFF"/>
</StackPanel>
<Grid Grid.Row="2">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Label Content="绑定信息 " FontSize="15" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding BindingInfo}" Width="420" Height="150" FontSize="15" Foreground="#FFFFFF"/>
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50 0 0 0 ">
<Label Content="提示信息 " FontSize="20" Foreground="#FFFFFF"/>
<TextBox TextWrapping="Wrap" Text="{Binding BindingInfo}" Width="500" Height="150" FontSize="20" Foreground="#FFFFFF"/>
</StackPanel>
<!--Text="{Binding BindingInfo}"-->
</Grid>
</Grid>
<Grid Grid.Column="1">
<Grid.RowDefinitions>
@ -73,10 +69,19 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5" Foreground="White">
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15" />
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
@ -102,7 +107,7 @@
ColumnHeaderHeight="35"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" AlternationCount="2"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" >
<!-- 表头剧中-->
@ -122,9 +127,11 @@
<!--修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding BoxCode}" Header="箱体条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="成品码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="绑定结果" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BoxCode}" Header="MES条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="成品条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="产品型号" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="绑定结果" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="plc下传结果" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding RecordTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="记录时间" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>

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

@ -190,10 +190,11 @@
<!--修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding BoxCode}" Header="箱体条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BoxName}" Header="箱体名称" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="成品码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="绑定结果" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BoxCode}" Header="MES条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="成品条码" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding ProductCode}" Header="产品型号" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="绑定结果" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding BindingResult}" Header="plc下传结果" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding RecordTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="记录时间" Width="4*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>

Write Preview
Loading…
Cancel
Save