From bf755562a82baa070c77b5aaffd8d6a1310438c7 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 08:24:36 +0800
Subject: [PATCH] PLC堆垛机出库任务

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index ee09096..a6d6fb2 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -10,7 +10,7 @@
     private static List<WcsStation> listPlcStation;
 
     private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
-    private static CancellationTokenSource cts = new CancellationTokenSource();//鍙栨秷绾跨▼鏍囪瘑
+    private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
 
     public static event EventHandler DeviceValueChangeEvent;
     static PLCTaskAction()
@@ -80,33 +80,33 @@
                         }
                         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 b = modPlcUtil.Connected();
                             var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.PlcPos);
-                            var c = modPlcUtil.Connected();
                             if (result.IsSucceed)
                             {
-                                if (value != 0)
-                                {
-                                    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();
-                                    //杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
-                                    DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
-                                }
+                                //鏃犳祦绋嬭烦鍑�
+                                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
                             {
                                 //鍒犻櫎褰撳墠杩炴帴 涓嬩竴娆″惊鐜噸鏂拌繛鎺�
+                                Console.WriteLine("杩炴帴鏂紑...");
                                 modPlcUtil.Close();
                                 listPlcUtil.Remove(modPlcUtil);
                             }
                         }
 
-                        Thread.Sleep(100);
+                        Thread.Sleep(3000);
                     }
                     catch (Exception ex)
                     {

--
Gitblit v1.8.0