|
|
|
@ -12,6 +12,7 @@ using Aucma.Core.Scanner;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
|
using Aucma.Core.OldBoxFoam.Business;
|
|
|
|
|
using System.Collections.ObjectModel;
|
|
|
|
|
|
|
|
|
|
namespace Aucma.Core.OldBoxFoam.ViewModels
|
|
|
|
|
{
|
|
|
|
@ -78,22 +79,52 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
|
|
|
|
|
/// <param name="e"></param>
|
|
|
|
|
public void RefreshPlc()
|
|
|
|
|
{
|
|
|
|
|
var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
|
|
|
|
|
if (obj != null)
|
|
|
|
|
var info = PlcHelper.melsecList.ToList();
|
|
|
|
|
|
|
|
|
|
if(info != null)
|
|
|
|
|
{
|
|
|
|
|
if (obj.plc.IsConnected)
|
|
|
|
|
{
|
|
|
|
|
PlcState(true);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
if(info.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
PlcState(false);
|
|
|
|
|
PlcUIColor.Clear();
|
|
|
|
|
info = info.OrderBy(x => x.Id).ToList();
|
|
|
|
|
foreach(var item in info)
|
|
|
|
|
{
|
|
|
|
|
if (item.IsConnect)
|
|
|
|
|
{
|
|
|
|
|
PlcState(true);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
PlcState(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
for(int i = PlcUIColor.Count - 1; i < 6; i++)
|
|
|
|
|
{
|
|
|
|
|
PlcState(false);
|
|
|
|
|
PlcUIColor.Add("Red");
|
|
|
|
|
PlcUIIcon.Add("Assets/Images/Red.png");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#region 原逻辑Delete By wenjy 2024-01-11 17:47:00
|
|
|
|
|
//var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
|
|
|
|
|
//if (obj != null)
|
|
|
|
|
//{
|
|
|
|
|
// if (obj.plc.IsConnected)
|
|
|
|
|
// {
|
|
|
|
|
// PlcState(true);
|
|
|
|
|
// }
|
|
|
|
|
// else
|
|
|
|
|
// {
|
|
|
|
|
// PlcState(false);
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
//else
|
|
|
|
|
//{
|
|
|
|
|
// PlcState(false);
|
|
|
|
|
//}
|
|
|
|
|
#endregion
|
|
|
|
|
}
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 扫码器状态刷新
|
|
|
|
@ -291,8 +322,9 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// UI plc 展示状态-颜色
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string _plcUIColor;
|
|
|
|
|
public string PlcUIColor
|
|
|
|
|
|
|
|
|
|
private ObservableCollection<string> _plcUIColor = new ObservableCollection<string>();
|
|
|
|
|
public ObservableCollection<string> PlcUIColor
|
|
|
|
|
{
|
|
|
|
|
get => _plcUIColor;
|
|
|
|
|
set => SetProperty(ref _plcUIColor, value);
|
|
|
|
@ -300,8 +332,8 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// UI plc 展示状态-图标
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string _plcUIIcon;
|
|
|
|
|
public string PlcUIIcon
|
|
|
|
|
private ObservableCollection<string> _plcUIIcon = new ObservableCollection<string>();
|
|
|
|
|
public ObservableCollection<string> PlcUIIcon
|
|
|
|
|
{
|
|
|
|
|
get => _plcUIIcon;
|
|
|
|
|
set => SetProperty(ref _plcUIIcon, value);
|
|
|
|
@ -318,14 +350,14 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
|
|
|
|
|
if (type)
|
|
|
|
|
{
|
|
|
|
|
PlcUIStatusWb = "PLC";
|
|
|
|
|
PlcUIColor = "Green";
|
|
|
|
|
PlcUIIcon = "Assets/Images/Green.png";
|
|
|
|
|
PlcUIColor.Add("Green");
|
|
|
|
|
PlcUIIcon.Add("Assets/Images/Green.png");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
PlcUIStatusWb = "PLC";
|
|
|
|
|
PlcUIColor = "Red";
|
|
|
|
|
PlcUIIcon = "Assets/Images/Red.png";
|
|
|
|
|
PlcUIColor.Add("Red");
|
|
|
|
|
PlcUIIcon.Add("Assets/Images/Red.png");
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|