.

src/Khd.Core.Wcs/MainCentralControl.cs

@@ -84,11 +84,11 @@ namespace Khd.Core.Wcs
                 SecondFloorLine secondFloorLine = new(_host, 2);
                 secondFloorLine.StartPoint();
 
-                //三层接驳位
+               //三层接驳位
                 ThirdFloorPoint thirdFloorPoint = new(_host, 3);
                 thirdFloorPoint.StartPoint();
 
-                //三层AGV
+               // 三层AGV
                 ThirdFloorAGV thirdFloorAGV = new(_host, 3);
                 thirdFloorAGV.StartPoint();
 

src/Khd.Core.Wcs/Wcs/FirstFloor.cs

@@ -523,11 +523,11 @@ namespace Khd.Core.Wcs.Wcs
                             if (Convert.ToInt32(equipstate06Value) == 0)
                             {
                                 dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01).OrderBy(t => t.createTime).ToList();
+                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus<5).OrderBy(t => t.createTime).ToList();
                                 foreach (var wcsTask in wcsTasks)
                                 {
                                     _logger.Info($"当前任务?{wcsTask.ToJsonString()}");
-                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.objid != wcsTask.objid).Any();
+                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.objid != wcsTask.objid  && t.nextPointId != 6).Any();
                                     if (!hasTask)
                                     {
                                         wcsTask.serialNo ??= SystemData.GetSerialNo(dbContext);