From 70cbc3af5300fe44b48215f8520f465ffa231df6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期二, 22 七月 2025 09:55:17 +0800
Subject: [PATCH] 修改问题

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 8b2011d..ccbe536 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -41,10 +41,10 @@
                     AGV(mod);                                       // AGV璋冨害
                     break;
                 case PLCTypeEnum.ShuttleCar: //绌挎杞�
-                    if (mod.PlcIdIP == "10.26.254.28")
-                    {
-                        break;
-                    }
+                    //if (mod.PlcIdIP == "10.26.254.28")
+                    //{
+                    //    break;
+                    //}
                     ShuttleCar(mod);
                     break;
                 case PLCTypeEnum.RobotPalletizer:
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 582106a..14cb836 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -429,10 +429,10 @@
                             var modConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == ip);
                             var modDevice = PLCTaskAction.plcDevices.First(s => s.StationNum == devStation);
                             var (plcResult, palletVal) = modConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
-                            //if (!plcResult.IsSucceed || Convert.ToInt32(palletVal) != 720)
-                            //{
-                            //    continue;//鏀捐揣宸ヤ綅娌℃湁璇诲彇鎴愬姛鎴栦笉鏄┖闂�
-                            //} 
+                            if (!plcResult.IsSucceed || Convert.ToInt32(palletVal) != 720)
+                            {
+                                continue;//鏀捐揣宸ヤ綅娌℃湁璇诲彇鎴愬姛鎴栦笉鏄┖闂�
+                            }
 
                             var gongwei = carcon.conveyorRuKu[endLocate];
                             //鍒ゆ柇浠诲姟

--
Gitblit v1.8.0