From aa76e0acd1337d82ddef1d5a34b245c988ecfc13 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期五, 30 五月 2025 18:25:25 +0800
Subject: [PATCH] 修改问题

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 6784e79..a9b033e 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -338,11 +338,11 @@
                             var endLocateCar = "";
                             if (valuez == 1)
                             {
-                                endLocateCar = "210401";
+                                endLocateCar = "011201";
                             }
                             else if (valuez == 2)
                             {
-                                endLocateCar = "210402"; //011202
+                                endLocateCar = "011202"; //
                             }
                             else
                             {
@@ -352,7 +352,7 @@
                             if (getCdTask == null)
                             {
                                 var (resultDlLock, valueDlLock) = plcConn.GetDBValue(modDevice.PosType, modDevice.PlcPos);
-                                if (resultDlLock.IsSucceed && valueDlLock!=3)
+                                if (resultDlLock.IsSucceed && valueDlLock!=3 && carXYZ != endLocateCar)
                                 {
                                     //娣诲姞灏忚溅鍏呯數浣嶇疆
                                     WcsTask modCarTask = new WcsTask()
@@ -405,11 +405,11 @@
                                         var endLocateCar = "";
                                         if (valuez == 1)
                                         {
-                                            endLocateCar = "210401";
+                                            endLocateCar = "011201";
                                         }
                                         else if (valuez == 2)
                                         {
-                                            endLocateCar = "210402";
+                                            endLocateCar = "011202";
                                         }
                                         else
                                         {
@@ -419,7 +419,7 @@
                                         if (getCdTask == null)
                                         {
                                             var (resultDlLock, valueDlLock) = plcConn.GetDBValue(modDevice.PosType, modDevice.PlcPos);
-                                            if (resultDlLock.IsSucceed && valueDlLock != 3)
+                                            if (resultDlLock.IsSucceed && valueDlLock != 3 && carXYZ != endLocateCar)
                                             {
                                                 //娣诲姞灏忚溅鍏呯數浣嶇疆
                                                 WcsTask modCarTask = new WcsTask()

--
Gitblit v1.8.0