From d10c23015080b541e810abd2dcae1b6084e71449 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 11 十二月 2025 10:09:21 +0800
Subject: [PATCH] 修改给AGV下发空托盘收集任务逻辑

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 23b3907..1bf1fa8 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1450,11 +1450,11 @@
         {
             return;
         }
-        
-         
-        if (_db.Queryable<WcsTask>().Any(s => s.EndLocate == modTask.EndLocate && s.IsDelete == false && s.Status == TaskStatusEnum.Doing && s.Type == PLCTypeEnum.AGV ))
+
+        var conveyList1 = new List<string>() { "B100101", "B030101" };//绌烘墭鏀堕泦鍖哄偍浣�
+        if (_db.Queryable<WcsTask>().Any(s => s.EndLocate == modTask.EndLocate && s.IsDelete == false && s.Status == TaskStatusEnum.Doing && s.Type == PLCTypeEnum.AGV && !conveyList1.Contains(s.EndLocate)))
         {
-            return; // 鏈夌洰鐨勪綅缃竴鑷翠笖姝e湪鎵ц鐨勪换鍔�
+            return; // 鏈夌洰鐨勪綅缃竴鑷翠笖姝e湪鎵ц鐨勪换鍔�(涓嶅寘鍚┖鎵樻敹闆�)
         }
 
         //涓嬪彂AGV浠诲姟 

--
Gitblit v1.8.0