From 9863192570e0356541235a2cb8177cae00edbc12 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期一, 23 九月 2024 19:15:15 +0800
Subject: [PATCH] 修改测试问题
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index b2aca60..8f3727a 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -370,8 +370,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 ).ToList(); //&& s.DeviceType == DeviceTypeEnum.Show
+ 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);
@@ -423,15 +425,31 @@
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 == 0 || value == 720)
{
- modDevice.BoHaveItem = value;
- //涓嬪彂鐘舵��
- var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
- HubUtil.PublicPosition(modInfo);
- UpdatePosition(modInfo);
+ bl = false;
}
+ else
+ {
+ bl = true;
+ }
+
+ var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
+ HubUtil.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+
+ // liudl 娉ㄩ噴锛氬拰鐢垫皵宸ョ▼甯堢‘璁ら〉闈㈠睍绀轰氦浜掑瓧鍚庡惎鐢ㄣ��
+ //var value = Convert.ToBoolean(item.Value);
+ //if (!value == modDevice.BoHaveItem)
+ //{
+ // modDevice.BoHaveItem = value;
+ // //涓嬪彂鐘舵��
+ // var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3,'0'), BoHaveItem = value };
+ // HubUtil.PublicPosition(modInfo);
+ // UpdatePosition(modInfo);
+ //}
}
break;
default:
--
Gitblit v1.8.0