fix

业务工程/分拣库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -100,7 +100,7 @@ namespace WCS.WorkEngineering.Systems
                                 {
                                     if (task.Device.Contains("Robot"))
                                     {
-                                        var lastTask = db.Default.Queryable<WCS_TaskInfo>().NoLock().First(x => x.AddrTo == task.AddrTo && x.Status > TaskStatus.WaitingToExecute);
+                                        var lastTask = db.Default.Queryable<WCS_TaskInfo>().NoLock().First(x => x.Type == TaskType.OutDepot && x.AddrTo == task.AddrTo && x.Status > TaskStatus.WaitingToExecute);
                                         if (lastTask != null)
                                         {
                                             World.Log($"等待任务结束:{task.AddrTo}上一组码垛任务未结束，等待{lastTask.ID}任务完成后开始初始化当前任务{task.ID}");

业务工程/分拣库/WCS.WorkEngineering/Systems/RGVSystems.cs

@@ -333,7 +333,12 @@ namespace WCS.WorkEngineering.Systems
                     {
                         var db = _db.Default;
                         var taskInfo = db.Queryable<WCS_TaskInfo>().First(p => p.ID == dev.Data.TaskNumber && p.Status == TaskStatus.ConveyorExecution);
-                        if (taskInfo == null) return;
+                        if (taskInfo == null)
+                        {
+                            World.Log($"未找到对应的任务{dev.Entity.Code}--{dev.Data.TaskNumber}");
+                            return;
+                        }
+
                         taskInfo.Status = TaskStatus.RgvExecution;
                         taskInfo.AddrNext = obj.Entity.Code;
                         taskInfo.EditWho = "WCS";
@@ -342,7 +347,13 @@ namespace WCS.WorkEngineering.Systems
                         taskInfo.AddWCS_TASK_DTL(db, dev.Entity.Code, obj.Entity.Code, $"任务分配至{obj.Entity.Code}");
                         task = taskInfo;
                     });
-                    if (task == null) continue;
+                    if (task == null)
+                    {
+                        World.Log($"未找到对应的任务{dev.Entity.Code}--{dev.Data.TaskNumber}");
+                        return;
+                    }
+
+                    ;
                     obj.Data.TaskNumber = task.ID;
                     obj.Data.CmdType = RGVCmdType.PickPutGoods;
                     obj.Data.StartPosition = dev.Entity.Code.ToShort();

业务工程/分拣库/WCS.WorkEngineering/Systems/桁架码垛/桁架.cs

@@ -225,7 +225,7 @@ namespace WCS.WorkEngineering.Systems
                         var isTime = x.AddTime < DateTime.Now.AddHours(-6);
                         var isPut = pickUpDevices.Any(p => p.key == x.LocationNo.ToString() && p.Count == x.Quantity);
                         //满足取货条件，或者是超六小时
-                        return isPut || (pickUpDevices.Any(p => p.key == x.LocationNo.ToString()) && isTime);
+                        return isPut || (pickUpDevices.Any(p => p.key == x.LocationNo.ToString() && p.HPCount > 0) && isTime);
                     });
                 if (!cacheLines.Any())
                 {