diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs index d7546ed5..5a4b020b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs @@ -5,9 +5,9 @@ /// public enum EnumTaskChainType { - AGV = 1, + CTU = 1, KIVA = 2, - CTU = 3, + AGV = 3, 电梯 = 4, 输送线 = 5, } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 3ea2ec4f..90e37cb1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -460,11 +460,12 @@ namespace Tnb.WarehouseMgr private async Task CallingLanding(List<(string endlocation_code, string device_id, string id, string floorNO)> endLocCodes) { Logger.Information($" 开始呼梯操作............."); + Logger.Information($"电梯信息:{JsonConvert.SerializeObject(s_elevatorMap)}"); try { foreach ((_, string devId, string disTaskId, string floorNO) in endLocCodes) { - + Logger.Information($"devId:{devId}"); if (!s_elevatorMap.TryGetValue(devId, out object? elevatorCode)) { continue; @@ -1041,22 +1042,18 @@ namespace Tnb.WarehouseMgr { if (points.FindAll(x => x.location_code != null && x.location_code.Contains("dt", StringComparison.OrdinalIgnoreCase))?.Count > 0) { - Logger.Information("获取当前电梯点"); //查询当前电梯点 List curEleDs = await _db.Queryable().Where(it => points.Select(x => x.id).Contains(it.point_id)).ToListAsync(); - Logger.Information($"当前电梯点:{string.Join(",",curEleDs.Select(x=>x.point_code))}"); //如果有电梯点,则会进行电梯的均匀分配 if (curEleDs?.Count > 0) { //当前电梯 WmsElevatorH curEle = await _db.Queryable().SingleAsync(it => it.id == curEleDs.First().bill_id && it.enabled == 1); - Logger.Debug($"档期电梯信息:{JsonConvert.SerializeObject(curEle)}"); //同电梯组电梯 List sGpEle = await _db.Queryable().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id && it.enabled == 1).ToListAsync(); - Logger.Debug($"同电梯组电梯:{JsonConvert.SerializeObject(sGpEle)}"); if (curEle == null && sGpEle?.Count > 0) {