From 70b4bdc6f999c55b75138e013abf436100e9987b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 23 六月 2025 15:33:16 +0800
Subject: [PATCH] 修改手自动
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 216 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 139 insertions(+), 77 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 8a30d4d..311e7ce 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -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,16 +15,24 @@
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>();
private static List<WcsDevice> listPlcDevice = new List<WcsDevice>();
- private static List<WcsPosition> listPlcStation = new List<WcsPosition>();
+ private static List<WcsPosition> listPlcPosition = new List<WcsPosition>();
private static List<WcsAlarmInfo> listAlarmInfo = new List<WcsAlarmInfo>();
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
@@ -32,24 +42,44 @@
{
get { return listPlcUtil; }
}
+ // 浜や簰鐐归泦鍚�
+ public static List<WcsDevice> plcDevices
+ {
+ get { return listPlcDevice; }
+ }
+ public static List<WcsPosition> plcPositions
+ {
+ get { return listPlcPosition; }
+ }
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
//璁㈤槄浜嬩欢
DeviceValueChangeEvent += PLCService.OnChangeEvent;
+ 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>
/// 鍒濆鍖朠LC杩炴帴
/// </summary>
public static void Init()
{
+ // var strMsg = new HttpService().RequestPackWcs("LN000001");
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 || s.Type == PLCTypeEnum.StackingRobot)
+ .Where(s => s.Enable == YesNoEnum.Y)
+ .ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsPosition>().ToList();
+ listPlcPosition = _db.Queryable<WcsPosition>().ToList();
listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
- Thread.Sleep(5000);
+ //Thread.Sleep(5000);
foreach (var modPlcUtil in listPlcUtil)
{
modPlcUtil.Close();
@@ -60,12 +90,20 @@
var plc = new PLCUtil(modPlc);
listPlcUtil.Add(plc);
}
- cts = new CancellationTokenSource();
- boRunningState = true;
- StartRead();
- ConnectionStatus();
- StartWatchAlarm();
- StartWatchPosition();
+ HubUtil.UpdateService(new PLCServiceModel()
+ {
+ BoRunningState = boRunningState,
+ BoOffline = boOffline,
+ BoRefresh = boRefresh
+ });
+ if (boRunningState)
+ {
+ cts = new CancellationTokenSource();
+ StartRead();
+ ConnectionStatus();
+ StartWatchAlarm();
+ StartWatchPosition();
+ }
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -104,7 +142,7 @@
}
if (!modPlcUtil.Connected)
{
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
modPlcUtil.Open();
continue;
}
@@ -124,16 +162,16 @@
{
//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;
dto.Type = _modplc.Type;
dto.PLCUtil = modPlcUtil;
- dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
+ dto.listStation = listPlcPosition.Where(s => s.DeviceId == modDevice.Id).ToList();
dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum && s.Level == DeviceLevelEnum.Station).ToList();
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
- //DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
+ DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
else if (!modPlcUtil.Connected)
{
@@ -145,7 +183,7 @@
}
}
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
}
catch (OperationCanceledException)
{
@@ -153,7 +191,7 @@
}
catch (Exception ex)
{
- Log.Error(ex.Message, ex);
+ Log.Error("璇诲彇PLC绾跨▼鍙戠敓寮傚父", ex);
}
}
}, cts.Token);
@@ -198,17 +236,17 @@
{
//杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
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);
+ Thread.Sleep(10000);
}
}
catch (OperationCanceledException)
@@ -218,10 +256,10 @@
}
catch (Exception ex)
{
- Log.Error(ex.Message, ex);
+ Log.Error("杩炴帴鐘舵�佺嚎绋嬪彂鐢熷紓甯�", ex);
}
- });
+ }, cts.Token);
}
@@ -258,27 +296,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);
- break;
}
- 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)
{
//淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
@@ -287,7 +316,7 @@
listPulish.Add(modAlarm);
}
//鍙栨秷鎶ヨ
- else if (value && modAlarm.Status == YesNoEnum.Y)
+ else if (!value && modAlarm.Status == YesNoEnum.Y)
{
modAlarm.AlarmTime = null;
modAlarm.Status = YesNoEnum.N;
@@ -304,13 +333,14 @@
modLog.Id = 0;
listLog.Add(modLog);
}
- _db.Insertable(listLog).ExecuteCommand();
- _plcHubContext.Clients.All.PublicAlarm(listPulish);
+ if (listLog.Count >= 0)
+ _db.Insertable(listLog).ExecuteCommand();
+ HubUtil.PublicAlarm(listPulish);
}
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Log.Error("鎶ヨ鐩戞帶鍙戠敓寮傚父", ex);
}
}
@@ -345,66 +375,98 @@
{
if (modPlcUtil == null)
continue;
+ 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)
{
- 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();
+ var modPosition = listPlcPosition.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "鐩殑宸ヤ綅");
+ string EndLocat = "";
+ if (modPosition != null)
{
- StationNum = modDevice.StationNum,
- BoHaveItem = false,
- Type = modPlc.Type,
- };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
- UpdatePosition(modInfo);
+ 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,
+ EndLocat = EndLocat,
+ };
+ HubUtil.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 bl = false;
+ int value = Convert.ToInt32(item.Value);
+ if (value <= 30)
+ {
+ 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);
+ }
+ }
+ break;
+ default:
+ break;
+ }
}
}
+ Thread.Sleep(3000);
}
- 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);
--
Gitblit v1.8.0