林豪 左 2 rokov pred
rodič
commit
a46b6a1dad
1 zmenil súbory, kde vykonal 7 pridanie a 2 odobranie
  1. 7 2
      WCS.WorkEngineering/Systems/AgvSystems.cs

+ 7 - 2
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -41,7 +41,7 @@ namespace WCS.WorkEngineering.Systems
                 SqlSugarHelper.Do(db =>
                 {
                     //获取所有未结束的叫料及背负式补空AGV任务
-                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => (v.TaskType == AGVTaskType.CallMaterial || v.TaskType == AGVTaskType.CallForMaterial))
+                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => (v.TaskType == AGVTaskType.CallMaterial || v.TaskType == AGVTaskType.CallForMaterial || v.TaskType == AGVTaskType.ForkliftFilling))
                                                                          .Where(v => v.Status < AGVTaskStatus.MissionCompleted)
                                                                          .SplitTable(tabs => tabs.Take(2)).ToList();
                     foreach (var agv in agvTaks)
@@ -55,7 +55,7 @@ namespace WCS.WorkEngineering.Systems
                         }
                         if (agv.AgvStatus == AGVTaskStatus.MissionCompleted)
                         {
-                            if (agv.TaskType == AGVTaskType.CallForMaterial)
+                            if (agv.TaskType is AGVTaskType.CallForMaterial or AGVTaskType.ForkliftFilling)
                             {
                                 var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.AgvTaskID == agv.ID);
                                 if (taskInfo == null)
@@ -74,6 +74,11 @@ namespace WCS.WorkEngineering.Systems
                                 taskInfo.CompleteOrCancelTasks(db);
                                 taskInfos.Add(taskInfo);
                             }
+                            else
+                            {
+                                agv.Status = AGVTaskStatus.MissionCompleted;
+                                db.Default.Updateable(agv).SplitTable().ExecuteCommand();
+                            }
                         }
                     }
                 });