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

调整函数，支持按份数批量打印

Browse Source
This commit is contained in:
yang.lee
2023-11-28 11:27:23 +08:00
parent c622f14aa5
commit 92397afcc0
8 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs
View File

@@ -39,7 +39,8 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> CallLiftTest(string devName, int floor)
{
bool isSuccefuly = false;
(int sysStatus, int runStatus, _, int doorStatus, int agvStatus) = await GetElevatorStatus(devName, CancellationToken.None);
var tags = new[] { "SysStatus", "RunStatus", "FloorNo", "DoorStatus", "AGVStatus" };
(int sysStatus, int runStatus, _, int doorStatus, int agvStatus) = await GetElevatorStatus(devName, tags, CancellationToken.None);
//判断当前楼层是否是放货楼层,如不是则呼叫电梯到当前楼层
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯 &&
agvStatus.ToEnum<EnumAgvStatus>() != EnumAgvStatus.AGV运行状态)
@@ -364,7 +365,7 @@ namespace Tnb.WarehouseMgr
{
dynamic result = await WriteTagAsync(devName, ElevatorConsts.AGVControl, 1);
JObject jo = JObject.Parse(result);
if (jo != null && jo.Value<string>("Result").Equals("Ok", StringComparison.OrdinalIgnoreCase))
if (jo != null && jo!.Value<string>("Result")!.Equals("Ok", StringComparison.OrdinalIgnoreCase))
{
isInAgvStatus = true;
}
@@ -402,10 +403,4 @@ namespace Tnb.WarehouseMgr
return isSuccefuly;
}
}
public class ElevatorData
{
public string? name { get; set; }
public string? value { get; set; }
}
}