From 75a1cfdc9b88519fa7a2af57e8b7d615c063b656 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 04 九月 2024 11:28:50 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 9576ac4..08cbcc6 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -13,6 +13,8 @@
//鑷埛鏂�
public static bool boRefresh = false;
+ public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
+
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
@@ -65,6 +67,7 @@
StartRead();
ConnectionStatus();
StartWatchAlarm();
+ StartWatchPosition();
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -232,11 +235,11 @@
var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
foreach (var modAlarm in listAlarm)
{
- (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, modAlarm.AlarmCode, "");
+ (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Bit, modAlarm.AlarmCode, "");
if (result.IsSucceed)
{
//鍋囪涓嶄负0灏辩畻鎶ヨ
- if (value != 0)
+ if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.N)
{
//淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
modAlarm.AlarmTime = DateTime.Now;
@@ -248,7 +251,7 @@
_plcHubContext.Clients.All.PublicAlarm(modAlarm.Adapt<WcsAlarmInfoOutput>());
}
//鍙栨秷鎶ヨ
- else if (modAlarm.Status == YesNoEnum.Y)
+ else if (Convert.ToBoolean(value) && modAlarm.Status == YesNoEnum.Y)
{
modAlarm.AlarmTime = null;
modAlarm.Status = YesNoEnum.N;
@@ -263,6 +266,101 @@
}, cts.Token);
}
/// <summary>
+ /// 寮�鍚綅缃洃鎺�
+ /// </summary>
+ public static void StartWatchPosition()
+ {
+ Task.Run(() =>
+ {
+ while (true)
+ {
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
+ }
+ break;
+ //throw new OperationCanceledException();
+ }
+ try
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil == null)
+ break;
+ var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
+ foreach (var modDevice in listDevice)
+ {
+ var modPlc = listPlc.FirstOrDefault(s => s.Id == modDevice.PlcId);
+ (var result, var value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
+ if (result.IsSucceed)
+ {
+ if (modPlc.Type == PLCTypeEnum.ConveyorLine)
+ {
+ //鍋囪涓嶄负0灏辩畻鏈変笢瑗�
+ if (value != 0 && !modDevice.BoHaveItem)
+ {
+ modDevice.BoHaveItem = true;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoHaveItem = true };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ else if (value == 0 && modDevice.BoHaveItem)
+ {
+ modDevice.BoHaveItem = false;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo()
+ {
+ StationNum = modDevice.StationNum,
+ BoHaveItem = false,
+ Type = modPlc.Type,
+ };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ }
+ else if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ {
+ //todo:杩欓噷鐨勯珮搴﹀彲鑳介渶瑕佸墠绔睍绀哄�煎拰plc鐨勫�艰繘琛屼竴涓崲绠�
+ var BoxHeight = Convert.ToInt32(value);
+ if (value != 0 && modDevice.BoxHeight != BoxHeight)
+ {
+ modDevice.BoxHeight = BoxHeight;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoxHeight = BoxHeight };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
+ }
+ }
+
+ }
+ }
+ }
+ catch (Exception)
+ {
+
+ }
+ }
+ });
+ }
+ private static void UpdatePosition(PlcPositionInfo modInfo)
+ {
+ var modTemp = listPositionInfo.FirstOrDefault(s => s.StationNum == modInfo.StationNum);
+ if (modTemp == null)
+ {
+ listPositionInfo.Add(modInfo);
+ }
+ else
+ {
+ modTemp.BoHaveItem = modInfo.BoHaveItem;
+ }
+ }
+ /// <summary>
/// 鍋滄鏈嶅姟
/// </summary>
public static void Stop()
--
Gitblit v1.8.0