From 1427584584848e1a8c7997d84945c0d19488d698 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 29 八月 2024 14:05:49 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 3be04f1..facc754 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,13 +1,17 @@
-锘縰sing Admin.NET.Core.Service;
+锘縰sing Furion.Logging;
+using Microsoft.AspNetCore.SignalR;
namespace WCS.Application;
public static class PLCTaskAction
{
+ //鏈嶅姟杩愯鐘舵��
+ public static bool boRunningState = false;
+
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
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;//鍙栨秷绾跨▼鏍囪瘑
@@ -20,7 +24,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 +36,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)
@@ -47,6 +51,7 @@
listPlcUtil.Add(plc);
}
cts = new CancellationTokenSource();
+ boRunningState = true;
StartRead();
}
/// <summary>
@@ -80,21 +85,22 @@
}
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 (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.PlcPos);
+ var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
if (result.IsSucceed)
{
- //if (value != 0)
- //{
+ //鏃犳祦绋嬭烦鍑�
+ 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
{
@@ -107,9 +113,13 @@
Thread.Sleep(3000);
}
+ catch (OperationCanceledException)
+ {
+ Console.WriteLine("涓绾跨▼");
+ }
catch (Exception ex)
{
-
+ Log.Error(ex.Message, ex);
}
}
}, cts.Token);
@@ -121,5 +131,6 @@
public static void Stop()
{
cts.Cancel();
+ boRunningState = false;
}
}
\ No newline at end of file
--
Gitblit v1.8.0