From 1fdcb4906cb97eb22fb1ceb95aa190c6e80cff1d Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期六, 14 九月 2024 13:23:07 +0800
Subject: [PATCH] 优化文件结构
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 4af0bf5..e97215b 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -25,7 +25,7 @@
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>();
@@ -36,16 +36,14 @@
get { return listPlcUtil; }
}
// 浜や簰鐐归泦鍚�
- public static List<WcsDevice> plcDevices
+ public static List<WcsDevice> plcDevices
{
get { return listPlcDevice; }
}
- // 浜や簰鐐归泦鍚�
- public static List<WcsPosition> plcStation
+ public static List<WcsPosition> plcPositions
{
- get { return listPlcStation; }
+ get { return listPlcPosition; }
}
-
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -62,9 +60,12 @@
public static void Init()
{
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);
@@ -156,7 +157,7 @@
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);
@@ -284,15 +285,15 @@
{
//鎶ヨ鐐逛綅
var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
- Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
+ //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}涓�");
+ //Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
var result = modUtil.GetPlcBatchDBValue(listaddress);
- Console.WriteLine("err" + result.Err);
+ //Console.WriteLine("err" + result.Err);
var listPulish = new List<WcsAlarmInfo>();
//娴嬭瘯鎶ヨ
//foreach (var modAlarm in listAlarm)
@@ -302,7 +303,7 @@
foreach (var item in result.Value)
{
var value = Convert.ToBoolean(item.Value);
- Console.WriteLine(item.Key + "+" + value);
+ //Console.WriteLine(item.Key + "+" + value);
var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
if (value && modAlarm.Status == YesNoEnum.N)
{
--
Gitblit v1.8.0