From 7d9d48cf1e9d5b28e59ea52a0ee1acdfd15f88e7 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 07 一月 2025 08:32:34 +0800
Subject: [PATCH] 问题修改
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index c301944..3a30f2c 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,17 +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>();
@@ -34,11 +43,14 @@
get { return listPlcUtil; }
}
// 浜や簰鐐归泦鍚�
- public static List<WcsDevice> plcDevices
+ public static List<WcsDevice> plcDevices
{
get { return listPlcDevice; }
}
-
+ public static List<WcsPosition> plcPositions
+ {
+ get { return listPlcPosition; }
+ }
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -47,16 +59,24 @@
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)
+ .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);
@@ -70,7 +90,7 @@
var plc = new PLCUtil(modPlc);
listPlcUtil.Add(plc);
}
- _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
+ HubUtil.UpdateService(new PLCServiceModel()
{
BoRunningState = boRunningState,
BoOffline = boOffline,
@@ -122,7 +142,7 @@
}
if (!modPlcUtil.Connected)
{
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
modPlcUtil.Open();
continue;
}
@@ -142,13 +162,13 @@
{
//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);
@@ -163,7 +183,7 @@
}
}
- Thread.Sleep(10000);
+ Thread.Sleep(1000);
}
catch (OperationCanceledException)
{
@@ -216,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)
@@ -276,26 +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);
}
- 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)
{
//淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
@@ -322,7 +334,7 @@
listLog.Add(modLog);
}
_db.Insertable(listLog).ExecuteCommand();
- _plcHubContext.Clients.All.PublicAlarm(listPulish);
+ HubUtil.PublicAlarm(listPulish);
}
}
catch (Exception ex)
@@ -362,8 +374,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);
@@ -389,29 +403,48 @@
{
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,
};
- _plcHubContext.Clients.All.PublicPosition(modInfo);
+ HubUtil.PublicPosition(modInfo);
UpdatePosition(modInfo);
}
}
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 };
- _plcHubContext.Clients.All.PublicPosition(modInfo);
+ 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);
}
}
@@ -421,7 +454,7 @@
}
}
}
- Thread.Sleep(1000);
+ Thread.Sleep(3000);
}
catch (Exception ex)
{
--
Gitblit v1.8.0