WCSNet6.git - Gitblit

			@@ -2,7 +2,9 @@
			using DocumentFormat.OpenXml.Drawing;
			using Furion.Logging;
			using Microsoft.AspNetCore.SignalR;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using System;
			//using WCS.Application.Util;

			namespace WCS.Application;
			public static class PLCTaskAction
			@@ -13,12 +15,19 @@
			public static bool boOffline = false;
			//自刷新
			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>();
			@@ -50,6 +59,10 @@
			boRunningState = _sysConfigService.GetConfigValue<bool>("sys_RunningState").Result;
			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>
			/// 初始化PLC连接
			@@ -57,7 +70,10 @@
			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();
			listPlcPosition = _db.Queryable<WcsPosition>().ToList();
			listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
			@@ -73,7 +89,7 @@
			var plc = new PLCUtil(modPlc);
			listPlcUtil.Add(plc);
			}
			_plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
			HubUtil.UpdateService(new PLCServiceModel()
			{
			BoRunningState = boRunningState,
			BoOffline = boOffline,
			@@ -145,7 +161,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;
			@@ -166,7 +182,7 @@
			}
			}

			Thread.Sleep(10000);
			Thread.Sleep(1000);
			}
			catch (OperationCanceledException)
			{
			@@ -219,14 +235,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);
			@@ -279,26 +295,18 @@
			{
			//报警点位
			var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
			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}个");
			var result = modUtil.GetPlcBatchDBValue(listaddress);
			Console.WriteLine("err" + result.Err);
			var listPulish = new List<WcsAlarmInfo>();
			//测试报警
			//foreach (var modAlarm in listAlarm)
			//{
			// result.Value.Add(modAlarm.AlarmCode, true);
			//}
			foreach (var item in result.Value)
			{
			var value = Convert.ToBoolean(item.Value);
			Console.WriteLine(item.Key + "+" + value);
			var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
			var stationNum = modAlarm.StationNum;
			if (value && modAlarm.Status == YesNoEnum.N)
			{
			//修改报警状态同时记录报警日志
			@@ -325,7 +333,7 @@
			listLog.Add(modLog);
			}
			_db.Insertable(listLog).ExecuteCommand();
			_plcHubContext.Clients.All.PublicAlarm(listPulish);
			HubUtil.PublicAlarm(listPulish);
			}
			}
			catch (Exception ex)
			@@ -365,8 +373,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);
			@@ -392,29 +402,48 @@
			{
			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 <= 30)
			{
			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)
			{
			modDevice.BoHaveItem = bl;
			var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
			HubUtil.PublicPosition(modInfo);
			UpdatePosition(modInfo);
			}
			}
			@@ -424,7 +453,7 @@
			}
			}
			}
			Thread.Sleep(1000);
			Thread.Sleep(3000);
			}
			catch (Exception ex)
			{