From ec899ee7e9ead5152bd9b4c2dedd75c79cab6fb0 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 28 八月 2024 17:03:44 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index ee09096..63086d6 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,4 +1,5 @@
-锘縰sing Admin.NET.Core.Service;
+锘縰sing Furion.Logging;
+using Microsoft.AspNetCore.SignalR;
namespace WCS.Application;
public static class PLCTaskAction
@@ -7,10 +8,10 @@
private static List<WcsPlc> listPlc;
private static List<WcsDevice> listPlcDevice;
- private static List<WcsStation> listPlcStation;
+ private static List<WcsPosition> listPlcStation;
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
- private static CancellationTokenSource cts = new CancellationTokenSource();//鍙栨秷绾跨▼鏍囪瘑
+ private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
@@ -20,7 +21,7 @@
listPlc = _db.Queryable<WcsPlc>().ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsStation>().ToList();
+ listPlcStation = _db.Queryable<WcsPosition>().ToList();
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -32,7 +33,7 @@
cts.Cancel();
listPlc = _db.Queryable<WcsPlc>().ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsStation>().ToList();
+ listPlcStation = _db.Queryable<WcsPosition>().ToList();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
Thread.Sleep(5000);
foreach (var modPlcUtil in listPlcUtil)
@@ -80,37 +81,41 @@
}
var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id).ToList();
//寰幆璇昏澶�
- foreach (var modDevice in listDevice)
+ foreach (var modDevice in listDevice.Where(s => s.Level == DeviceLevelEnum.DB))
{
- var b = modPlcUtil.Connected();
- var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.PlcPos);
- var c = modPlcUtil.Connected();
+ var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
if (result.IsSucceed)
{
- if (value != 0)
- {
- var dto = modDevice.Adapt<WcsDeviceDto>();
- dto.Value = value;
- dto.Type = _modplc.Type;
- dto.PLCUtil = modPlcUtil;
- dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
- //杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
- DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
- }
+ //鏃犳祦绋嬭烦鍑�
+ if (value == 0)
+ continue;
+ var dto = modDevice.Adapt<WcsDeviceDto>();
+ dto.Value = value;
+ dto.Type = _modplc.Type;
+ dto.PLCUtil = modPlcUtil;
+ dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
+ dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum).ToList();
+ //杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
+ DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
else
{
//鍒犻櫎褰撳墠杩炴帴 涓嬩竴娆″惊鐜噸鏂拌繛鎺�
+ Console.WriteLine("杩炴帴鏂紑...");
modPlcUtil.Close();
listPlcUtil.Remove(modPlcUtil);
}
}
- Thread.Sleep(100);
+ Thread.Sleep(3000);
+ }
+ catch (OperationCanceledException)
+ {
+ Console.WriteLine("涓绾跨▼");
}
catch (Exception ex)
{
-
+ Log.Error(ex.Message, ex);
}
}
}, cts.Token);
--
Gitblit v1.8.0