From 79ad6097cbe4b4d6cee66dd8ad9c3c1c8f2b5243 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 15 十月 2024 16:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 2137784..e4ef889 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -15,12 +15,17 @@
public static bool boRefresh = false;
//婕旂ず妯″紡
public static bool boDemo = false;
+ //婊氱瓛鍙嶈浆
+ public static bool boDrumReversal = false;
+ //鍑哄簱閿佸畾
+ public static bool boOutLock = false;
+ //鍏ュ簱閿佸畾
+ public static bool boEnterLock = 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>>();
private static readonly SysConfigService _sysConfigService = App.GetService<SysConfigService>();
private static List<WcsPlc> listPlc = new List<WcsPlc>();
@@ -53,6 +58,9 @@
boOffline = _sysConfigService.GetConfigValue<bool>("sys_Offline").Result;
boRefresh = _sysConfigService.GetConfigValue<bool>("sys_Refresh").Result;
boDemo = _sysConfigService.GetConfigValue<bool>("sys_demo").Result;
+ boDrumReversal = _sysConfigService.GetConfigValue<bool>("sys_DrumReversal").Result;
+ boOutLock = _sysConfigService.GetConfigValue<bool>("sys_BoOutLock").Result;
+ boEnterLock = _sysConfigService.GetConfigValue<bool>("sys_BoEnterLock").Result;
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -79,7 +87,7 @@
var plc = new PLCUtil(modPlc);
listPlcUtil.Add(plc);
}
- _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
+ HubUtil.UpdateService(new PLCServiceModel()
{
BoRunningState = boRunningState,
BoOffline = boOffline,
@@ -151,7 +159,7 @@
{
//Console.WriteLine($"{modPlc.IP}璇诲彇{modDevice.DbNumber}.{modDevice.PlcPos}鐨勫�间负锛歿value}");
//鏃犳祦绋嬭烦鍑�
- if (value == 0)
+ if (value == 0 )// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine
continue;
var dto = modDevice.Adapt<WcsDeviceDto>();
dto.Value = value;
@@ -172,7 +180,7 @@
}
}
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
}
catch (OperationCanceledException)
{
@@ -225,14 +233,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);
@@ -331,7 +339,7 @@
listLog.Add(modLog);
}
_db.Insertable(listLog).ExecuteCommand();
- _plcHubContext.Clients.All.PublicAlarm(listPulish);
+ HubUtil.PublicAlarm(listPulish);
}
}
catch (Exception ex)
@@ -371,8 +379,10 @@
{
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>();
+ var plcIp = modPlcUtil.PlcIP;
+ 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)
{
listaddress.Add(modDevice.DbNumber + "." + modDevice.PlcPos, modDevice.PosType);
@@ -398,31 +408,58 @@
{
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);
}
}
break;
case PLCTypeEnum.ConveyorLine:
{
- var value = Convert.ToBoolean(item.Value);
- if (value != modDevice.BoHaveItem)
+ var bl = false;
+ int value = Convert.ToInt32(item.Value);
+ if (value == 0)
{
- modDevice.BoHaveItem = value;
- //涓嬪彂鐘舵��
- var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
+ bl = false;
+ }
+ else
+ {
+ bl = true;
+ }
+ if (bl != modDevice.BoHaveItem)
+ {
+ var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
+ HubUtil.PublicPosition(modInfo);
UpdatePosition(modInfo);
}
+ // liudl 娉ㄩ噴锛氬拰鐢垫皵宸ョ▼甯堢‘璁ら〉闈㈠睍绀轰氦浜掑瓧鍚庡惎鐢ㄣ��
+ //var value = Convert.ToBoolean(item.Value);
+ //if (!value == modDevice.BoHaveItem)
+ //{
+ // modDevice.BoHaveItem = value;
+ // //涓嬪彂鐘舵��
+ // var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3,'0'), BoHaveItem = value };
+ // HubUtil.PublicPosition(modInfo);
+ // UpdatePosition(modInfo);
+ //}
}
break;
default:
--
Gitblit v1.8.0