wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
alex
2023-10-08 17:25:38 +08:00
parent ed68401030
commit d77286d01c
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -60,11 +60,7 @@ namespace Tnb.WarehouseMgr
_elevatorControlService = elevatorControlService; _elevatorControlService = elevatorControlService;
AddUnExecuteTask = async code => AddUnExecuteTask = async code =>
{ {
(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(code, CancellationToken.None); await _elevatorControlService.CallLift(code, 5, CancellationToken.None);
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯)
{
await _elevatorControlService.CallLift(code, 5, CancellationToken.None);
}
}; };
} }
@@ -344,13 +340,13 @@ namespace Tnb.WarehouseMgr
//呼梯操作 //呼梯操作
//获取目标库位为电梯库位的任务 //获取目标库位为电梯库位的任务
var endLocCodes = disTasks.Select(it => (it.endlocation_code, it.device_id, it.id)).Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase)).ToList(); //var endLocCodes = disTasks.Select(it => (it.endlocation_code, it.device_id, it.id)).Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase)).ToList();
if (endLocCodes?.Count > 0) //if (endLocCodes?.Count > 0)
{ //{
await CallingLanding(endLocCodes); // await CallingLanding(endLocCodes);
} //}
//调用AGV创建任务链接口 ////调用AGV创建任务链接口
await AgvDispatch(disTasks, agvCts.Token); //await AgvDispatch(disTasks, agvCts.Token);
} }
} }
@@ -407,11 +403,8 @@ namespace Tnb.WarehouseMgr
{ {
var devName = _elevatorMap[devId].ToString(); var devName = _elevatorMap[devId].ToString();
elevatorQueueItem.task_status = "执行中"; elevatorQueueItem.task_status = "执行中";
(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(devName, CancellationToken.None); await _elevatorControlService.CallLift(devName, 5, CancellationToken.None);
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯)
{
await _elevatorControlService.CallLift(devName, 5, CancellationToken.None);
}
} }
//如果当前电梯有任务在做，将当前呼梯任务放入待执行队列 //如果当前电梯有任务在做，将当前呼梯任务放入待执行队列

2
WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
View File

@@ -160,7 +160,7 @@ namespace Tnb.WarehouseMgr
var isOk = await _wareHouseService.GenPreTask(preTasks, null!); var isOk = await _wareHouseService.GenPreTask(preTasks, null!);
if (isOk) if (isOk)
{ {
if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.endlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null) if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.startlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null)
{ {
//查询库位表 //查询库位表
var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString()); var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());

2
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -66,7 +66,7 @@ public class Startup : AppStartup
services.AddTaskMessageNotify(); services.AddTaskMessageNotify();
//定时任务 //定时任务
services.AddTimedTaskService(); services.AddHostedService<TimedTaskBackgroundService>();
//Agv心跳监听服务 //Agv心跳监听服务
services.AddAgvHeartbeatMonitor(); services.AddAgvHeartbeatMonitor();
//services.AddHostedService<TimedTaskBackgroundService>(); //services.AddHostedService<TimedTaskBackgroundService>();