From 60328b34b853959613f8c97567b4a1ba934a15a9 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期日, 22 九月 2024 17:36:39 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 4af0bf5..b2aca60 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -20,12 +20,11 @@
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>>();
private static readonly SysConfigService _sysConfigService = App.GetService<SysConfigService>();
private static List<WcsPlc> listPlc = new List<WcsPlc>();
private static List<WcsDevice> listPlcDevice = new List<WcsDevice>();
- private static List<WcsPosition> listPlcStation = new List<WcsPosition>();
+ private static List<WcsPosition> listPlcPosition = new List<WcsPosition>();
private static List<WcsAlarmInfo> listAlarmInfo = new List<WcsAlarmInfo>();
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
@@ -36,16 +35,14 @@
get { return listPlcUtil; }
}
// 浜や簰鐐归泦鍚�
- public static List<WcsDevice> plcDevices
+ public static List<WcsDevice> plcDevices
{
get { return listPlcDevice; }
}
- // 浜や簰鐐归泦鍚�
- public static List<WcsPosition> plcStation
+ public static List<WcsPosition> plcPositions
{
- get { return listPlcStation; }
+ get { return listPlcPosition; }
}
-
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -62,9 +59,12 @@
public static void Init()
{
cts.Cancel();
- listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
+ listPlc = _db.Queryable<WcsPlc>()
+ .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
+ .Where(s => s.Enable == YesNoEnum.Y)
+ .ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsPosition>().ToList();
+ listPlcPosition = _db.Queryable<WcsPosition>().ToList();
listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
//Thread.Sleep(5000);
@@ -78,7 +78,7 @@
var plc = new PLCUtil(modPlc);
listPlcUtil.Add(plc);
}
- _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
+ HubUtil.UpdateService(new PLCServiceModel()
{
BoRunningState = boRunningState,
BoOffline = boOffline,
@@ -156,7 +156,7 @@
dto.Value = value;
dto.Type = _modplc.Type;
dto.PLCUtil = modPlcUtil;
- dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
+ dto.listStation = listPlcPosition.Where(s => s.DeviceId == modDevice.Id).ToList();
dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum && s.Level == DeviceLevelEnum.Station).ToList();
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
@@ -171,7 +171,7 @@
}
}
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
}
catch (OperationCanceledException)
{
@@ -224,14 +224,14 @@
{
//杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
Console.WriteLine($"閫氱煡鍓嶇鍙樻洿{modPlc.Text} {modPlc.IsConn}");
- _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ HubUtil.PublicPlcConn(modPlc);
}
sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
}
else
{
sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
- _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ HubUtil.PublicPlcConn(modPlc);
}
}
Thread.Sleep(1000);
@@ -284,15 +284,15 @@
{
//鎶ヨ鐐逛綅
var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
- Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
+ //Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
var listaddress = new Dictionary<string, PLCDataTypeEnum>();
foreach (var modAlarm in listAlarm)
{
listaddress.Add(modAlarm.AlarmCode, PLCDataTypeEnum.Bit);
}
- Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
+ //Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
var result = modUtil.GetPlcBatchDBValue(listaddress);
- Console.WriteLine("err" + result.Err);
+ //Console.WriteLine("err" + result.Err);
var listPulish = new List<WcsAlarmInfo>();
//娴嬭瘯鎶ヨ
//foreach (var modAlarm in listAlarm)
@@ -302,7 +302,7 @@
foreach (var item in result.Value)
{
var value = Convert.ToBoolean(item.Value);
- Console.WriteLine(item.Key + "+" + value);
+ //Console.WriteLine(item.Key + "+" + value);
var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
if (value && modAlarm.Status == YesNoEnum.N)
{
@@ -330,7 +330,7 @@
listLog.Add(modLog);
}
_db.Insertable(listLog).ExecuteCommand();
- _plcHubContext.Clients.All.PublicAlarm(listPulish);
+ HubUtil.PublicAlarm(listPulish);
}
}
catch (Exception ex)
@@ -397,16 +397,26 @@
{
var value = Convert.ToInt32(item.Value);
var height = Math.Round(value / 790000d * 200).ToInt();
- if (modDevice.BoxHeight != height)
+ var modPosition = listPlcPosition.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "鐩殑宸ヤ綅");
+ string EndLocat = "";
+ if (modPosition != null)
{
+ var (result2, value2) = modPlcUtil.GetPlcDBValue(modPosition.PosType, modDevice.DbNumber, modPosition.PlcPos);
+ if (result2.IsSucceed)
+ EndLocat = Convert.ToString(value2);
+ }
+ if (modDevice.BoxHeight != height || modDevice.EndLocat != EndLocat)
+ {
+ modDevice.EndLocat = EndLocat;
modDevice.BoxHeight = Math.Round(value / 790000d * 200).ToInt();
var modInfo = new PlcPositionInfo()
{
Type = modPlc.Type,
StationNum = modDevice.StationNum,
- BoxHeight = modDevice.BoxHeight
+ BoxHeight = modDevice.BoxHeight,
+ EndLocat = EndLocat,
};
- _plcHubContext.Clients.All.PublicPosition(modInfo);
+ HubUtil.PublicPosition(modInfo);
UpdatePosition(modInfo);
}
}
@@ -419,7 +429,7 @@
modDevice.BoHaveItem = value;
//涓嬪彂鐘舵��
var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
+ HubUtil.PublicPosition(modInfo);
UpdatePosition(modInfo);
}
}
@@ -429,7 +439,7 @@
}
}
}
- Thread.Sleep(1000);
+ Thread.Sleep(300);
}
catch (Exception ex)
{
--
Gitblit v1.8.0