|
@@ -58,8 +58,6 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private static object objlook = new object();
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 背负式agv请求出库任务
|
|
|
/// </summary>
|
|
@@ -68,7 +66,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
[HttpPost]
|
|
|
public ApplyEmptySpoolResponse ApplyEmptySpool([FromBody] AgvFillEmptySpaceRequest reqDto)
|
|
|
{
|
|
|
- lock (objlook)
|
|
|
+ lock (LockHub.ApplyEmptySpoolLock)
|
|
|
{
|
|
|
ApplyEmptySpoolResponse agvFill = new ApplyEmptySpoolResponse();
|
|
|
|
|
@@ -169,6 +167,14 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
}
|
|
|
switch (reqDto.method)
|
|
|
{
|
|
|
+ //case "start": //表示请求巷道
|
|
|
+ // agvTask.Status = AGVTaskStatus.RequestOrPermission1;
|
|
|
+ // break;
|
|
|
+
|
|
|
+ //case "end": //表示请求巷道
|
|
|
+ // agvTask.Status = AGVTaskStatus.RequestOrPermission1;
|
|
|
+ // break;
|
|
|
+
|
|
|
case "applyContinue": //表示请求巷道
|
|
|
|
|
|
agvTask.Status = AGVTaskStatus.RequestOrPermission1;
|
|
@@ -186,6 +192,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == id);
|
|
|
taskInfo.AgvTaskID = agvTask.ID;
|
|
|
taskInfo.Status = Entity.TaskStatus.AGVExecution;
|
|
|
+ db.Default.Updateable(taskInfo).ExecuteCommand();
|
|
|
taskInfo.AddWCS_TASK_DTL(db, agvTask.Station, "agv执行中");
|
|
|
db.Default.Updateable(taskInfo).ExecuteCommand();
|
|
|
}
|
|
@@ -205,6 +212,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
taskInfo.Status = Entity.TaskStatus.Finish;
|
|
|
taskInfo.EedTime = DateTime.Now;
|
|
|
taskInfo.AddWCS_TASK_DTL(db, "agv缓存区", "任务完成");
|
|
|
+ db.Default.Updateable(taskInfo).ExecuteCommand();
|
|
|
taskInfo.CompleteOrCancelTasks(db);
|
|
|
db.Default.Updateable(taskInfo).ExecuteCommand();
|
|
|
}
|