取消任务优化

WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

@@ -130,7 +130,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                             if (cancelRes == null) continue;
 
                             //找到对应的AGV任务
-                            var agv = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.ID == task.AgvTaskID).SplitTable(v => v.Take(2)).First();
+                            var agv = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.ID == task.AgvTaskID && v.AgvStatus < AGVTaskStatus.MissionCompleted).SplitTable(v => v.Take(2)).First();
                             if (agv != null)
                             {
                                 if (!agv.AgvID.IsNullOrEmpty())
@@ -198,7 +198,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                 if (cancelRes == null) continue;
 
                                 //找到对应的AGV任务
-                                var agv = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.ID == task.AgvTaskID).SplitTable(v => v.Take(2)).First();
+                                var agv = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.ID == task.AgvTaskID && v.AgvStatus < AGVTaskStatus.MissionCompleted).SplitTable(v => v.Take(2)).First();
                                 if (agv != null)
                                 {
                                     //if (!agv.AgvID.IsNullOrEmpty())