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

1、任务执行新增，更具目标库位判断是否为电梯库位进行呼梯操作

Browse Source 
2、放货确认接口新增代码逻辑
This commit is contained in:
alex
2023-09-27 17:58:13 +08:00
parent c34762b0b3
commit 471d614cf2
12 changed files with 489 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.WorkFlow.Entitys.Dto.FlowLaunch;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
@@ -24,10 +25,12 @@ using Senparc.NeuChar.ApiHandlers;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs;
using Tnb.WarehouseMgr.Entities.Entity;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
@@ -43,12 +46,14 @@ namespace Tnb.WarehouseMgr
private readonly ICacheManager _cacheManager;
private readonly IEventPublisher _eventPublisher;
private readonly IUserManager _userManager;
private readonly IElevatorControlService _elevatorControlService;
public DeviceProviderService(ISqlSugarRepository<WmsInstockH> repository, IWareHouseService wareHouseService,
ICacheManager cacheManager,
IEventPublisher eventPublisher,
IUserManager userManger
IUserManager userManger,
IElevatorControlService elevatorControlService
)
{
_db = repository.AsSugarClient();
@@ -56,6 +61,7 @@ namespace Tnb.WarehouseMgr
_cacheManager = cacheManager;
_eventPublisher = eventPublisher;
_userManager = userManger;
_elevatorControlService = elevatorControlService;
}
/// <summary>
@@ -78,10 +84,10 @@ namespace Tnb.WarehouseMgr
{
try
{
var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.startlocation_id)
.Where((a, b, c) => c.startlocation_code == input.sourceName && c.bill_code == input.taskCode)
.ToListAsync();
//var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
// .LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.startlocation_id)
// .Where((a, b, c) => c.startlocation_code == input.sourceName && c.bill_code == input.taskCode)
// .ToListAsync();
}
catch (Exception)
{
@@ -101,17 +107,38 @@ namespace Tnb.WarehouseMgr
{
try
{
var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
//根据Agv传递的参数获取，对应的电梯
var elevator = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.endlocation_id)
.Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == input.taskCode)
.ToListAsync();
.OrderBy(a => a.elevator_code)
.FirstAsync();
(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(elevator.elevator_code,CancellationToken.None);
Log.Information($"电梯当前状态->系统状态:{sysStatus.ToEnum<EnumSysStatus>().ToString()},运行状态:{runStatus.ToEnum<EnumRunStatus>().ToString()},Agv状态:{agvStatus.ToEnum<EnumAgvStatus>().ToString()},当前楼层：{floorNo}");
//判断Agv电梯是否进入状态
if (agvStatus.ToEnum<EnumAgvStatus>() != EnumAgvStatus.AGV运行状态)
{
await _elevatorControlService.WriteTagAsync(elevator.elevator_code, ElevatorConsts.AGVControl, 1);
}
//电梯到达目标楼层后，判断当前电梯门状态是否为开门到位保持状态
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯
&& doorStatus.ToEnum<EnumDoorStatus>() == EnumDoorStatus.开门到位保持 && floorNo == 4)
{
elevator.current_floor = floorNo;
await _db.Updateable(elevator).UpdateColumns(it => it.current_floor).ExecuteCommandAsync();
return await ToApiResult(HttpStatusCode.OK, "成功");
}
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
}
catch (Exception)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
throw;
}
return await ToApiResult(HttpStatusCode.OK, "未启用");
}
/// <summary>