From 43cf594ffea7d58e71e1121756639dae31973086 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 27 Nov 2023 10:19:02 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B0=83=E6=95=B4=E6=9D=A1?=
=?UTF-8?q?=E7=A0=81=E7=BB=91=E5=AE=9A=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ViewModels/IndexPageViewModel.cs | 68 ++++++++++---------
.../ViewModels/StatisticsPageViewModel.cs | 2 +-
.../Views/IndexPageView.xaml | 53 ++++++++-------
.../Views/StatisticsPageView.xaml | 9 +--
4 files changed, 71 insertions(+), 61 deletions(-)
diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
index f1b365dd..c7491bd5 100644
--- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs
@@ -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 + "】绑定成功";
diff --git a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs
index ebf7c8d2..a7bdcfb8 100644
--- a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs
+++ b/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs
@@ -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)
diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
index 70fdef81..b98bba6d 100644
--- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
+++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml
@@ -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>
diff --git a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
index cd9819d4..33c4d31c 100644
--- a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml
@@ -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>