From 1d323f5377dd5f9a58d01954a6c12b9d5bd8a766 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 14:33:40 +0800
Subject: [PATCH] 控制台位置实时通讯
---
Web/src/views/device/deviceInfo/index.vue | 20 +++---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 4
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 108 ++++++++++++++++++++---------------
3 files changed, 74 insertions(+), 58 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);
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index d200fb9..4480c14 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -139,12 +139,12 @@
return new { listPlc, modService };
}
/// <summary>
- /// 鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ
+ /// 鑾峰彇浣嶇疆淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
[ApiDescriptionSettings(Name = "ListPosition")]
- [DisplayName("鑾峰彇浣嶇疆涓婃湁娌℃湁涓滆タ")]
+ [DisplayName("鑾峰彇浣嶇疆淇℃伅")]
public List<PlcPositionInfo> ListPosition()
{
//娴嬭瘯鐢�
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 28b3860..9101e17 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -169,55 +169,55 @@
//鍫嗗灈鏈烘暟鎹�
const cellsDataLine = ref([
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 2, Code: '002', LineCode: '01', EndLocat: '01010101', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 2, Code: '10', LineCode: '01', EndLocat: '01010101', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 3, Code: '003', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 4, Code: '004', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 5, Code: '005', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 6, Code: '006', LineCode: '02', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 50 },
+ { Id: 6, Code: '20', LineCode: '02', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 7, Code: '007', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 8, Code: '008', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 9, Code: '009', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 10, Code: '010', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 11, Code: '011', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 12, Code: '012', LineCode: '03', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 12, Code: '30', LineCode: '03', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 13, Code: '013', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 14, Code: '014', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 15, Code: '015', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 16, Code: '016', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 17, Code: '017', LineCode: '04', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 17, Code: '40', LineCode: '04', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 18, Code: '018', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 19, Code: '019', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 20, Code: '020', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 21, Code: '021', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 22, Code: '022', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 23, Code: '023', LineCode: '05', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 200 },
+ { Id: 23, Code: '50', LineCode: '05', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 24, Code: '024', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 25, Code: '025', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 26, Code: '026', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 27, Code: '027', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 28, Code: '028', LineCode: '06', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
+ { Id: 28, Code: '60', LineCode: '06', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 29, Code: '029', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 30, Code: '030', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 31, Code: '031', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 32, Code: '032', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 33, Code: '033', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 34, Code: '034', LineCode: '07', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 34, Code: '70', LineCode: '07', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 35, Code: '035', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 36, Code: '036', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 37, Code: '037', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 38, Code: '038', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 39, Code: '039', LineCode: '08', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 39, Code: '80', LineCode: '08', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 40, Code: '040', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 41, Code: '041', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 42, Code: '042', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 43, Code: '043', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 44, Code: '044', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 45, Code: '045', LineCode: '09', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 45, Code: '90', LineCode: '09', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 46, Code: '046', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 47, Code: '047', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 48, Code: '048', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
{ Id: 49, Code: '049', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
- { Id: 50, Code: '050', LineCode: '10', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 10 },
+ { Id: 50, Code: '100', LineCode: '10', EndLocat: '', IsShow: 0, IsUse: 0, BoxHeight: 0 },
{ Id: 51, Code: '051', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
]);
--
Gitblit v1.8.0