fix

WCS.WorkEngineering/Systems/一楼入库工位处理系统.cs

@@ -45,10 +45,8 @@ namespace WCS.WorkEngineering.Systems
                var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode) ?? throw new KnownException($"未找到RFID:{barcode}对应WCS任务", LogLevelEnum.High);
                if (taskInfo.Status != Entity.TaskStatus.AGVExecution)
                {
-                   if (!db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货")))
-                   {
-                       throw new KnownException($"任务:{taskInfo.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
-                   }
+                   if (db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货"))) return;
+                   else throw new KnownException($"任务:{taskInfo.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
                }
 
                if (!obj.Data3.Status.HasFlag(StatusEunm.ManualStorage)) //不是手动入库

WCS.WorkEngineering/Systems/二楼入库工位处理系统.cs

@@ -56,16 +56,15 @@ namespace WCS.WorkEngineering.Systems
 
                  #region 非空轮初始化入库任务
 
-                 if (task == null)
+                 if (taskInfo == null)
                  {
                      taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data.TaskNumber && v.Type == TaskType.EnterDepot);
                      if (taskInfo == null) throw new KnownException($"未找到任务[{obj.Data.TaskNumber}],或该任务不是入库任务", LogLevelEnum.Mid);
                      if (taskInfo.Status != Entity.TaskStatus.AGVExecution)
                      {
-                         if (!db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货")))
-                         {
-                             throw new KnownException($"任务:{task.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
-                         }
+                         if (!db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货"))) return;
+                         else throw new KnownException($"任务:{task.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
+
                      }
                  }