WCSNet6.git - Gitblit

			@@ -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);