林豪 左 2 éve
szülő
commit
c7c171fa13
1 módosított fájl, 2 hozzáadás és 20 törlés
  1. 2 20
      WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

+ 2 - 20
WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

@@ -133,7 +133,9 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         db.Default.Insertable(agv).SplitTable().ExecuteCommand();
 
                         task.AgvTaskID = agv.ID;
+                        task.Status = Entity.TaskStatus.AGVExecution;
                         db.Default.Updateable(task).ExecuteCommand();
+                        task.AddWCS_TASK_DTL(db, dev.Entity.Code, "AGV", "agv执行中");
 
                         agvFill.LocCode = dev.Entity.Code;
                         agvFill.SpoolType = "4";
@@ -194,26 +196,6 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                 break;
 
                             case "applySecurity": //表示请求放货或取货
-                                if (reqDto.callCode is "1012" or "1014" or "1016")
-                                {
-                                    agvTask = db.Default.Queryable<WCS_AgvTaskInfo>().SplitTable(tabs => tabs.Take(2))
-                                                        .First(v => v.Status == AGVTaskStatus.NewBuild && v.TaskType == AGVTaskType.CallForMaterial && v.Station == reqDto.callCode)
-                                                        ?? throw new Exception("为找找到对应AGV任务");
-                                    agvTask.AgvID = reqDto.taskCode;
-                                    var obj = World.GetSystemInstance<GetDeviceSystem>().Invoke("输送机") as List<Station>;
-                                    var id = obj.FirstOrDefault(v => v.Entity.Code == agvTask.Station).Data.TaskNumber;
-                                    taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == id) ?? throw new Exception("为找找到对应WCS任务");
-                                    taskInfo.AgvTaskID = agvTask.ID;
-                                    taskInfo.Status = Entity.TaskStatus.AGVExecution;
-                                    db.Default.Updateable(taskInfo).ExecuteCommand();
-                                    taskInfo.AddWCS_TASK_DTL(db, agvTask.Station, "agv执行中");
-                                }
-                                if (agvTask == null)
-                                {
-                                    res.code = AgvResponseCode.Fail;
-                                    res.message = "未找到对应的AGV任务";
-                                    return;
-                                }
                                 agvTask.AgvStatus = AGVTaskStatus.RequestOrPermission2;
                                 break;