From d77d9ff80f5fd8cd70c775fbfc30dc27061bfad2 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 09:13:06 +0800
Subject: [PATCH] 增加缠膜机交互和修改满放和空取程序

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |   32 +++++++++-----------------------
 1 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index e4ef889..390cd4c 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
@@ -139,7 +141,7 @@
                         }
                         if (!modPlcUtil.Connected)
                         {
-                            Thread.Sleep(10000);
+                            Thread.Sleep(1000);
                             modPlcUtil.Open();
                             continue;
                         }
@@ -243,7 +245,7 @@
                             HubUtil.PublicPlcConn(modPlc);
                         }
                     }
-                    Thread.Sleep(1000);
+                    Thread.Sleep(10000);
                 }
             }
             catch (OperationCanceledException)
@@ -293,26 +295,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)
                             {
                                 //淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
@@ -436,7 +430,7 @@
                                     {
                                         var bl = false;
                                         int value = Convert.ToInt32(item.Value);
-                                        if (value == 0)
+                                        if (value <= 30)
                                         {
                                             bl = false;
                                         }
@@ -444,22 +438,14 @@
                                         {
                                             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);
                                         }
-                                        // 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:
@@ -467,7 +453,7 @@
                             }
                         }
                     }
-                    Thread.Sleep(300);
+                    Thread.Sleep(3000);
                 }
                 catch (Exception ex)
                 {

--
Gitblit v1.8.0