1、任务执行新增,更具目标库位判断是否为电梯库位进行呼梯操作
2、放货确认接口新增代码逻辑
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Consts
|
||||
{
|
||||
public class ElevatorConsts
|
||||
{
|
||||
/// <summary>
|
||||
/// 系统状态
|
||||
/// </summary>
|
||||
public const string SysStatus = "SysStatus";
|
||||
/// <summary>
|
||||
/// 运行状态
|
||||
/// </summary>
|
||||
public const string RunStatus = "RunStatus";
|
||||
/// <summary>
|
||||
/// 门状态
|
||||
/// </summary>
|
||||
public const string DoorStatus = "DoorStatus";
|
||||
/// <summary>
|
||||
/// 门状态
|
||||
/// </summary>
|
||||
public const string FloorNo = "FloorNo";
|
||||
/// <summary>
|
||||
/// 载重信息
|
||||
/// </summary>
|
||||
public const string LoadInfor = "LoadInfor";
|
||||
/// <summary>
|
||||
/// 故障码
|
||||
/// </summary>
|
||||
public const string ErrCode = "ErrCode";
|
||||
/// <summary>
|
||||
/// 门触发
|
||||
/// </summary>
|
||||
public const string DoorExecute = "DoorExecute";
|
||||
/// <summary>
|
||||
/// 通讯状态
|
||||
/// </summary>
|
||||
public const string CommStatus = "CommStatus";
|
||||
/// <summary>
|
||||
/// 楼层触发
|
||||
/// </summary>
|
||||
public const string FloorExecute = "FloorExecute";
|
||||
/// <summary>
|
||||
/// AGV控制
|
||||
/// </summary>
|
||||
public const string AGVControl = "AGVControl";
|
||||
/// <summary>
|
||||
/// AGV状态
|
||||
/// </summary>
|
||||
public const string AGVStatus = "AGVStatus";
|
||||
/// <summary>
|
||||
/// AGV心跳
|
||||
/// </summary>
|
||||
public const string AGVKeepalive = "AGVKeepalive";
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using JNPF.Common.Contracts;
|
||||
using System.Security.Principal;
|
||||
using JNPF.Common.Contracts;
|
||||
using JNPF.Common.Security;
|
||||
using SqlSugar;
|
||||
|
||||
@@ -88,5 +89,13 @@ public partial class WmsElevatorH : BaseEntity<string>
|
||||
/// 时间戳(用于并发控制)
|
||||
/// </summary>
|
||||
public DateTime? timestamp { get; set; }
|
||||
/// <summary>
|
||||
/// 门状态
|
||||
/// </summary>
|
||||
public int door_status { get; set; }
|
||||
/// <summary>
|
||||
/// 当前电梯所在楼层
|
||||
/// </summary>
|
||||
public int current_floor { get; set; }
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
using JNPF.Common.Contracts;
|
||||
using JNPF.Common.Security;
|
||||
using SqlSugar;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
[SugarTable("wms_elevator_unexecute")]
|
||||
public partial class WmsElevatorUnexecute : BaseEntity<string>
|
||||
{
|
||||
public WmsElevatorUnexecute()
|
||||
{
|
||||
id = SnowflakeIdHelper.NextId();
|
||||
}
|
||||
/// <summary>
|
||||
/// 电梯Id
|
||||
/// </summary>
|
||||
public string? elevator_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 电梯编号
|
||||
/// </summary>
|
||||
public string? elevator_code { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 目标楼层
|
||||
/// </summary>
|
||||
public int? floor { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 任务状态
|
||||
/// </summary>
|
||||
public string? task_status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public string? create_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTime? create_time { get; set; }
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Enums
|
||||
{
|
||||
public enum EnumAgvControl
|
||||
{
|
||||
前门开门 = 3,
|
||||
前门关门 = 4,
|
||||
后门开门 = 5,
|
||||
后门关门 = 6,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Enums
|
||||
{
|
||||
public enum EnumAgvStatus
|
||||
{
|
||||
正常状态 = 0,
|
||||
等待进入AGV状态 = 1,
|
||||
AGV运行状态 = 2,
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Enums
|
||||
{
|
||||
public enum EnumDoorStatus
|
||||
{
|
||||
未知状态 = 0,
|
||||
开门过程 = 1,
|
||||
开门到位保持 = 2,
|
||||
关门过程 = 3,
|
||||
关门到位保持 = 4,
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Enums
|
||||
{
|
||||
/// <summary>
|
||||
/// 电梯运行状态
|
||||
/// </summary>
|
||||
public enum EnumRunStatus
|
||||
{
|
||||
停梯 = 0,
|
||||
上运行 = 2,
|
||||
下运行 = 2,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.WarehouseMgr.Entities.Enums
|
||||
{
|
||||
/// <summary>
|
||||
/// 电梯系统状态枚举
|
||||
/// </summary>
|
||||
public enum EnumSysStatus
|
||||
{
|
||||
故障状态 = 0,
|
||||
消防状态 = 1,
|
||||
其他非服务状态 = 2,
|
||||
正常状态 = 3,
|
||||
地震状态 = 4
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user