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

1、解决SnowflakeIdHeler.NextId()空引用问题

Browse Source 
2、将Agv心跳检测服务移至自定义定时服务，统一维护管理
This commit is contained in:
yang.lee
2023-10-16 13:53:33 +08:00
parent 9597c9b3e5
commit 66242f929d
10 changed files with 163 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -90,22 +90,24 @@ namespace Tnb.WarehouseMgr
var elevator = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.startlocation_id)
.LeftJoin<WmsPointH>((a, b, c, d) => c.startlocation_id == d.location_id)
.Where((a, b, c, d) => d.point_code == input.sourceName && c.bill_code == input.taskCode)
.Where((a, b, c, d) => d.point_code == input.sourceName && input.taskCode.Contains(c.bill_code))
.FirstAsync();
(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(elevator.elevator_code, CancellationToken.None);
//Log.Information($"elevator!=null?{elevator!=null}");
(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus("Elevator1", CancellationToken.None);
Log.Information($"电梯当前状态->系统状态:{sysStatus.ToEnum<EnumSysStatus>().ToString()},运行状态:{runStatus.ToEnum<EnumRunStatus>().ToString()},Agv状态:{agvStatus.ToEnum<EnumAgvStatus>().ToString()},当前楼层：{floorNo}");
if (floorNo == 3)
{
//var endFloor = elevator.end_floor;
var floor = 5;
if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.开门到位保持)
{
await _elevatorControlService.SendOpenCloseCmd(elevator.elevator_code, 3); //发送电梯前门开门指令
await _elevatorControlService.SendOpenCloseCmd("Elevator1", 3); //发送电梯前门开门指令
}
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯
&& doorStatus.ToEnum<EnumDoorStatus>() == EnumDoorStatus.开门到位保持 && floorNo == 3)
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯)
{
elevator.current_floor = floorNo;
await _db.Updateable(elevator).UpdateColumns(it => it.current_floor).ExecuteCommandAsync();
//elevator.current_floor = floor;
//await _db.Updateable(elevator).UpdateColumns(it => it.current_floor).ExecuteCommandAsync();
return await ToApiResult(HttpStatusCode.OK, "成功");
}
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
@@ -154,7 +156,6 @@ namespace Tnb.WarehouseMgr
{
await _elevatorControlService.SendOpenCloseCmd("Elevator1", 3); //发送电梯前门开门指令
}
Log.Information("fadsfadsfadsfadsfdsa");
if (sysStatus == (int)EnumSysStatus.正常状态 && runStatus == (int)EnumRunStatus.停梯
&& doorStatus == (int)EnumDoorStatus.开门到位保持)
{
@@ -167,10 +168,10 @@ namespace Tnb.WarehouseMgr
}
catch (Exception ex)
{
Log.Error("更新延迟队列异常",ex);
Log.Error("更新延迟队列异常", ex);
throw;
}
}
return await ToApiResult(HttpStatusCode.OK, "成功");
}
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
@@ -262,13 +263,16 @@ namespace Tnb.WarehouseMgr
disTaskIds = disTasks.Select(x => x.id).ToList()
};
await _wareHouseService.TaskExecuteAfter(taskExecuteAfterUpInput);
Log.Information("Agv取货完成");
var elevatorQueueItem = await _db.Queryable<WmsElevatorUnexecute>().FirstAsync(it => disTasks.Select(x => x.id).Contains(it.distask_id) && it.task_status == "执行中");
if (elevatorQueueItem != null)
{
Log.Information("开始进入关门流程");
var disTask = disTasks.Find(x => x.id == elevatorQueueItem.distask_id);
if (disTask?.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID)
//if (disTask?.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID)
{
var doorStatus = await _elevatorControlService.GetTagAsync(elevatorQueueItem.elevator_code, ElevatorConsts.DoorStatus);
var doorStatus = await _elevatorControlService.GetTagAsync("Elevator1", ElevatorConsts.DoorStatus);
if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.关门到位保持)
{
await _elevatorControlService.SendOpenCloseCmd(elevatorQueueItem.elevator_code, 4); //向电梯发送前门关门指令