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 e73e987f64
commit 8d9f31869e
4 changed files with 207 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
Aucma.Core.Palletiz/Business/InstoreBusiness.cs
Unescape Escape View File

@ -69,7 +69,8 @@ namespace Aucma.Core.Palletiz.Business
{
try
{
// 刷新页面
List<ScannerModel> allScanners = Appsettings.app<ScannerModel>("ScannerServer").ToList();
ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp);
// plc下发结果
@ -78,7 +79,7 @@ namespace Aucma.Core.Palletiz.Business
List<int> spaceNumList = new List<int>();
// 入库记录
RecordInStore recordInstore = new RecordInStore();
//1.根据成品码找货道
List<BaseSpaceInfo> spaceList = getSpaceBySNCode(SNCode,recordInstore);
// 根据货道信息判断下发plc信号

68
Aucma.Core.Palletiz/Models/IndexInfo.cs
Unescape Escape View File

@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.Palletiz.Models
{
/// <summary>
/// 分垛首页数据刷新实体
/// </summary>
public class IndexInfo
{
/// <summary>
/// 序号
/// </summary>
public int No { get; set; }
/// <summary>
/// //公司条码
/// </summary>
public string ProductSNCode { get; set; }
/// <summary>
/// //扫描时间
/// </summary>
public DateTime ProductScanTime { get; set; }
/// <summary>
/// //产品型号
/// </summary>
public string ProductModel { get; set; }
/// <summary>
/// 订单编号
/// </summary>
public string ProductOrderNo { get; set; }
/// <summary>
/// 订单计划数
/// </summary>
public string OrderQty { get; set; }
/// <summary>
/// 订单实际数
/// </summary>
public string ActQty { get; set; }
/// <summary>
/// 刷新标志，定时器检测true刷新
/// </summary>
public bool ProductRefreshFlag { get; set; }
/// <summary>
/// 界面提示信息
/// </summary>
public string MsgInfo { get; set; }
/// <summary>
/// 是否报警信息
/// </summary>
public bool MsgAlarmFlag { get; set; }
}
}

109
Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -142,6 +142,115 @@ namespace Aucma.Core.Palletiz.ViewModels
}
#region 界面变量定义
#region 产品条码
private string _productSNCode;
public string ProductSNCode
{
get { return _productSNCode; }
set
{
_productSNCode = value;
OnPropertyChanged(nameof(ProductSNCode));
}
}
#endregion
#region 扫描时间
private string _productScanTime;
public string ProductScanTime
{
get { return _productScanTime; }
set
{
_productScanTime = value;
OnPropertyChanged(nameof(ProductScanTime));
}
}
#endregion
#region 产品型号
private string _productModel;
public string ProductModel
{
get { return _productModel; }
set
{
_productModel = value;
OnPropertyChanged(nameof(ProductModel));
}
}
#endregion
#region 订单编号
private string _productOrderNo;
public string ProductOrderNo
{
get { return _productOrderNo; }
set
{
_productOrderNo = value;
OnPropertyChanged(nameof(ProductOrderNo));
}
}
#endregion
#region 订单数量
private string _orderQty;
public string OrderQty
{
get { return _orderQty; }
set
{
_orderQty = value;
OnPropertyChanged(nameof(OrderQty));
}
}
#endregion
#region 订单已上传
private string _actQty;
public string ActQty
{
get { return _actQty; }
set
{
_actQty = value;
OnPropertyChanged(nameof(ActQty));
}
}
#endregion
#region 界面提示信息
private string _msgInfo;
public string MsgInfo
{
get { return _msgInfo; }
set
{
_msgInfo = value;
OnPropertyChanged(nameof(MsgInfo));
}
}
private Brush _msgColor;
public Brush MsgColor
{
get { return _msgColor; }
set
{
_msgColor = value;
OnPropertyChanged(nameof(MsgColor));
}
}
#endregion
#endregion
#region 日产量柱状图
/// <summary>

54
Aucma.Core.Palletiz/Views/IndexPageView.xaml
Unescape Escape View File

@ -112,46 +112,46 @@
<TextBlock Text="产品分垛" Foreground="White" FontWeight="Bold" FontSize="30"/>
</Border>
<Border Grid.Row="0" Grid.Column="1" Background="#1157b9">
<TextBlock Text="产品条码" Foreground="White" FontSize="20"/>
<TextBlock Text="产品条码" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="1" Grid.Column="1" Background="#1157b9">
<TextBlock Text="产品型号" Foreground="White" FontSize="20"/>
<Border Grid.Row="0" Grid.Column="2">
<TextBlock Text="{Binding ProductSNCode}" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="1" Background="#1157b9">
<TextBlock Text="订单数量" Foreground="White" FontSize="20"/>
<Border Grid.Row="0" Grid.Column="3" Background="#1157b9">
<TextBlock Text="扫描时间" Foreground="White" FontSize="20" />
</Border>
<Border Grid.Row="3" Grid.Column="1" Background="#1157b9">
<TextBlock Text="提示信息" Foreground="White" FontSize="20" />
<Border Grid.Row="0" Grid.Column="4">
<TextBlock Text="{Binding ProductScanTime}" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="0" Grid.Column="2">
<TextBlock Text="312799000093D8U0050" Foreground="White" FontSize="20"/>
<Border Grid.Row="1" Grid.Column="1" Background="#1157b9">
<TextBlock Text="产品型号" Foreground="White" FontSize="20" />
</Border>
<Border Grid.Row="1" Grid.Column="2">
<TextBlock Text="SC-279,C,特许" Foreground="White" FontSize="20"/>
<TextBlock Text="{Binding ProductModel}" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="2">
<TextBlock Text="76" Foreground="White" FontSize="20"/>
<Border Grid.Row="1" Grid.Column="3" Background="#1157b9">
<TextBlock Text="订单编号" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3">
<TextBlock Text="获取信息成功3127991000093D8U0050 返回值 : Y.上传条码失败E,条码重复,上传条码失败E,条码重复上传" Foreground="White" FontSize="20"/>
<Border Grid.Row="1" Grid.Column="4">
<TextBlock Text="{Binding ProductOrderNo}" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="0" Grid.Column="3" Background="#1157b9">
<TextBlock Text="扫描时间" Foreground="White" FontSize="20"/>
<Border Grid.Row="2" Grid.Column="1" Background="#1157b9">
<TextBlock Text="订单数量" Foreground="White" FontSize="20" />
</Border>
<Border Grid.Row="1" Grid.Column="3" Background="#1157b9">
<TextBlock Text="订单编号" Foreground="White" FontSize="20"/>
<Border Grid.Row="2" Grid.Column="2">
<TextBlock Text="{Binding OrderQty}" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="3" Background="#1157b9">
<TextBlock Text="订单已上传" Foreground="White" FontSize="20"/>
<TextBlock Text="订单已上传" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="0" Grid.Column="4">
<TextBlock Text="2023-08-29 13:10:53" Foreground="White" FontSize="20"/>
<Border Grid.Row="2" Grid.Column="4">
<TextBlock Text="{Binding ActQty}" Foreground="White"/>
</Border>
<Border Grid.Row="1" Grid.Column="4">
<TextBlock Text="000011203687" Foreground="White" FontSize="20"/>
<Border Grid.Row="3" Grid.Column="1" Background="#1157b9">
<TextBlock Text="提示信息" Foreground="White" FontSize="20" />
</Border>
<Border Grid.Row="2" Grid.Column="4">
<TextBlock Text="48" Foreground="White" FontSize="20"/>
<Border Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3">
<TextBlock Text="{Binding MsgInfo}" Foreground="{Binding MsgColor}" FontSize="20"/>
</Border>
<Border Grid.Row="0" Grid.Column="5" Background="#1157b9">
<TextBlock Text="入库数量" Foreground="White" FontSize="20"/>
@ -199,7 +199,7 @@
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" Step="1" >
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
@ -230,7 +230,7 @@
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15">
<lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" Step="1">
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>

Write Preview
Loading…
Cancel
Save