From 1d323f5377dd5f9a58d01954a6c12b9d5bd8a766 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 14:33:40 +0800
Subject: [PATCH] 控制台位置实时通讯
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 108 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 8a30d4d..69e9e93 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -49,7 +49,7 @@
listPlcStation = _db.Queryable<WcsPosition>().ToList();
listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
- Thread.Sleep(5000);
+ //Thread.Sleep(5000);
foreach (var modPlcUtil in listPlcUtil)
{
modPlcUtil.Close();
@@ -62,6 +62,12 @@
}
cts = new CancellationTokenSource();
boRunningState = true;
+ _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
+ {
+ BoRunningState = boRunningState,
+ BoOffline = boOffline,
+ BoRefresh = boRefresh
+ });
StartRead();
ConnectionStatus();
StartWatchAlarm();
@@ -153,7 +159,7 @@
}
catch (Exception ex)
{
- Log.Error(ex.Message, ex);
+ Log.Error("璇诲彇PLC绾跨▼鍙戠敓寮傚父", ex);
}
}
}, cts.Token);
@@ -218,10 +224,10 @@
}
catch (Exception ex)
{
- Log.Error(ex.Message, ex);
+ Log.Error("杩炴帴鐘舵�佺嚎绋嬪彂鐢熷紓甯�", ex);
}
- });
+ }, cts.Token);
}
@@ -263,7 +269,6 @@
foreach (var modAlarm in listAlarm)
{
listaddress.Add(modAlarm.AlarmCode, PLCDataTypeEnum.Bit);
- break;
}
Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
var result = modUtil.GetPlcBatchDBValue(listaddress);
@@ -310,7 +315,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Log.Error("鎶ヨ鐩戞帶鍙戠敓寮傚父", ex);
}
}
@@ -346,65 +351,76 @@
if (modPlcUtil == null)
continue;
var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
+ var modPlc = listPlc.FirstOrDefault(s => s.Id == modPlcUtil.PlcId); var listaddress = new Dictionary<string, PLCDataTypeEnum>();
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)
+ listaddress.Add(modDevice.DbNumber + "." + modDevice.PlcPos, modDevice.PosType);
+ }
+ //鎵归噺璇�
+ var result = modPlcUtil.GetPlcBatchDBValue(listaddress);
+ //娴嬭瘯鐢�
+ //foreach (var modDevice in listDevice)
+ //{
+ // if (modPlc.Type == PLCTypeEnum.StackingMachine)
+ // result.Value.Add(modDevice.DbNumber + "." + modDevice.PlcPos, new Random().Next(790000));
+ // else if (modPlc.Type == PLCTypeEnum.ConveyorLine)
+ // result.Value.Add(modDevice.DbNumber + "." + modDevice.PlcPos, new Random().Next(2) == 0);
+ //}
+ foreach (var item in result.Value)
+ {
+ var modDevice = listDevice.FirstOrDefault(s => item.Key == (s.DbNumber + "." + s.PlcPos));
+ if (modDevice == null)
+ continue;
+ switch (modPlc.Type)
{
- if (modPlc.Type == PLCTypeEnum.ConveyorLine)
- {
- //鍋囪涓嶄负0灏辩畻鏈変笢瑗�
- if (value != 0 && !modDevice.BoHaveItem)
+ case PLCTypeEnum.StackingMachine:
{
- 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()
+ var value = Convert.ToInt32(item.Value);
+ var height = Math.Round(value / 790000d * 200).ToInt();
+ if (modDevice.BoxHeight != height)
{
- StationNum = modDevice.StationNum,
- BoHaveItem = false,
- Type = modPlc.Type,
- };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
- UpdatePosition(modInfo);
+ modDevice.BoxHeight = Math.Round(value / 790000d * 200).ToInt();
+ var modInfo = new PlcPositionInfo()
+ {
+ Type = modPlc.Type,
+ StationNum = modDevice.StationNum,
+ BoxHeight = modDevice.BoxHeight
+ };
+ _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)
+ break;
+ case PLCTypeEnum.ConveyorLine:
{
- modDevice.BoxHeight = BoxHeight;
- //涓嬪彂鐘舵��
- var modInfo = new PlcPositionInfo() { StationNum = modDevice.StationNum, BoxHeight = BoxHeight };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
- UpdatePosition(modInfo);
+ var value = Convert.ToBoolean(item.Value);
+ if (value != modDevice.BoHaveItem)
+ {
+ modDevice.BoHaveItem = value;
+ //涓嬪彂鐘舵��
+ var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
+ _plcHubContext.Clients.All.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
}
- }
+ break;
+ default:
+ break;
}
-
}
}
+ Thread.Sleep(1000);
}
- catch (Exception)
+ catch (Exception ex)
{
-
+ Log.Error("浣嶇疆鐩戞帶鍙戠敓寮傚父", ex);
}
}
});
}
private static void UpdatePosition(PlcPositionInfo modInfo)
{
- var modTemp = listPositionInfo.FirstOrDefault(s => s.StationNum == modInfo.StationNum);
+ var modTemp = listPositionInfo.FirstOrDefault(s => s.StationNum == modInfo.StationNum && modInfo.Type == s.Type);
if (modTemp == null)
{
listPositionInfo.Add(modInfo);
--
Gitblit v1.8.0