From a1f7d28ff9440989cb8507c6adccba31a66208fc Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 27 八月 2024 16:42:10 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 3be04f1..a6d6fb2 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -80,21 +80,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);
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
{
--
Gitblit v1.8.0