From 778a05f391f4e08ce2d69dbda9a46bb8b5b078c3 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 15 十月 2024 16:42:40 +0800
Subject: [PATCH] 修改工作台输送线状态实时更新问题

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index ee3557b..f8471a5 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -374,7 +374,7 @@
                         if (modPlcUtil == null)
                             continue;
                         var plcIp = modPlcUtil.PlcIP;
-                        var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId ).ToList();  //&& s.DeviceType == DeviceTypeEnum.Show
+                        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)
@@ -430,7 +430,7 @@
                                     {
                                         var bl = false;
                                         int value = Convert.ToInt32(item.Value);
-                                        if (value == 0 || value == 720)
+                                        if (value == 0)
                                         {
                                             bl = false;
                                         }
@@ -438,11 +438,12 @@
                                         {
                                             bl = true;
                                         }
-                                      
-                                        var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
-                                        HubUtil.PublicPosition(modInfo);
-                                        UpdatePosition(modInfo);
-
+                                        if (bl != modDevice.BoHaveItem)
+                                        {
+                                            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)

--
Gitblit v1.8.0