diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs index 2ec8664b..9e818faa 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs @@ -272,43 +272,7 @@ namespace Tnb.WarehouseMgr disTaskIds = disTasks.Select(x => x.id).ToList() }; await _wareHouseService.TaskComplate(taskCompleUpInput); - //收到放货确认通知,向电梯发送到3楼的指令 - var elevatorQueueItem = await _db.Queryable().FirstAsync(it => disTasks.Select(x => x.id).Contains(it.distask_id) && it.task_status == "执行中"); - if (elevatorQueueItem != null) - { - var disTask = disTasks.Find(x => x.id == elevatorQueueItem.distask_id); - //if (disTask?.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID) - { - var doorStatus = await _elevatorControlService.GetTagAsync(elevatorQueueItem.elevator_code, ElevatorConsts.DoorStatus); - if (doorStatus.ToEnum() != EnumDoorStatus.关门到位保持) - { - await _elevatorControlService.SendOpenCloseCmd(elevatorQueueItem.elevator_code, 4); //向电梯发送前门关门指令 - } - var floor = disTask.end_floor.ParseToInt(); - if (floor == 4) - floor = 5; - else if (floor == 3) - floor = 4; - else if (floor == 2) - floor = 3; - //发送到目标楼的指令 - CancellationTokenSource cts = new(); - var reuslt = await _elevatorControlService.WriteTagAsync(elevatorQueueItem.elevator_code, ElevatorConsts.FloorExecute, floor); - (int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) tuple = (-1, -1, -1, -1, -1); - await Task.Run(async () => - { - do - { - tuple = await _elevatorControlService.GetElevatorStatus(elevatorQueueItem.elevator_code, cts.Token); - } while (tuple.sysStatus != 3 && tuple.runStatus != 0 && tuple.floorNo != disTask.end_floor.ParseToInt()); - - }, cts.Token); - - if (sysStatus.ToEnum() == EnumSysStatus.正常状态 && runStatus.ToEnum() == EnumRunStatus.停梯 && -agvStatus.ToEnum() != EnumAgvStatus.AGV运行状态 && floorNo != 4) - - } - } + } } catch (Exception ex)