From 3055d3cce91f0b8f16d18fc32b0619be69485699 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 19 Sep 2024 12:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 2bfd74c..b2688e2 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -543,7 +543,10 @@ namespace Khd.Core.Wcs.Wcs
                                         BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == wcsTask.floorNo);
                                         if (wcsTask.taskStatus == 0 && Convert.ToInt32(hoisterTrayIn06Value) == 0)//创建状态，并且里面没有货物
                                         {
-                                            if (lineEquip.equipStatus == 1)
+                                           // 目的楼层从接驳位出发入库的任务 --待测试
+                                            var InTask = dbContext.WcsTask.FirstOrDefault(t => t.currPointId == lineEquip.objid);
+
+                                            if (lineEquip.equipStatus == 1 && InTask==null)
                                             {
                                                 _logger.Info("提升机线程：" + wcsTask.floorNo + "楼接驳位有AGV任务，跳过当前任务");
                                                 continue;