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
			@@ -15,6 +17,12 @@
			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>();

			@@ -52,6 +60,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>
			/// 初始化PLC连接
			@@ -150,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;
			@@ -171,7 +182,7 @@
			}
			}

			Thread.Sleep(10000);
			Thread.Sleep(1000);
			}
			catch (OperationCanceledException)
			{
			@@ -284,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)
			{
			//修改报警状态同时记录报警日志
			@@ -370,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);
			@@ -397,14 +402,24 @@
			{
			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,
			};
			HubUtil.PublicPosition(modInfo);
			UpdatePosition(modInfo);
			@@ -413,12 +428,21 @@
			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 };
			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);
			}
			@@ -429,7 +453,7 @@
			}
			}
			}
			Thread.Sleep(300);
			Thread.Sleep(3000);
			}
			catch (Exception ex)
			{