From d79fcd9534d97f5bbb4edb66dbb925dea0479304 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期日, 22 九月 2024 15:06:34 +0800
Subject: [PATCH] ssd12313

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index f2a77a3..b2aca60 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -171,7 +171,7 @@
                             }
                         }
 
-                        Thread.Sleep(10000);
+                        Thread.Sleep(1000);
                     }
                     catch (OperationCanceledException)
                     {
@@ -397,14 +397,24 @@
                                     {
                                         var value = Convert.ToInt32(item.Value);
                                         var height = Math.Round(value / 790000d * 200).ToInt();
-                                        if (modDevice.BoxHeight != height)
+                                        var modPosition = listPlcPosition.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "鐩殑宸ヤ綅");
+                                        string EndLocat = "";
+                                        if (modPosition != null)
                                         {
+                                            var (result2, value2) = modPlcUtil.GetPlcDBValue(modPosition.PosType, modDevice.DbNumber, modPosition.PlcPos);
+                                            if (result2.IsSucceed)
+                                                EndLocat = Convert.ToString(value2);
+                                        }
+                                        if (modDevice.BoxHeight != height || modDevice.EndLocat != EndLocat)
+                                        {
+                                            modDevice.EndLocat = EndLocat;
                                             modDevice.BoxHeight = Math.Round(value / 790000d * 200).ToInt();
                                             var modInfo = new PlcPositionInfo()
                                             {
                                                 Type = modPlc.Type,
                                                 StationNum = modDevice.StationNum,
-                                                BoxHeight = modDevice.BoxHeight
+                                                BoxHeight = modDevice.BoxHeight,
+                                                EndLocat = EndLocat,
                                             };
                                             HubUtil.PublicPosition(modInfo);
                                             UpdatePosition(modInfo);

--
Gitblit v1.8.0