wanshenmean
昨天 0b2869539598059704e1d208e2bcb18603b0fe0f
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotJob.cs
@@ -122,7 +122,7 @@
            // 初始化命令处理器
            // 简单命令处理器:处理状态更新等简单命令
            var simpleCommandHandler = new RobotSimpleCommandHandler(_taskProcessor, socketGateway, _logger);
            var simpleCommandHandler = new RobotSimpleCommandHandler(_taskProcessor, socketGateway, _logger, _stateManager);
            // 前缀命令处理器:处理 pickfinished、putfinished 等带参数的命令
            var prefixCommandHandler = new RobotPrefixCommandHandler(robotTaskService, _taskProcessor, _stateManager, socketGateway, fakeBatteryPositionService, _logger);
@@ -209,13 +209,21 @@
                }
                // 轮询获取该设备的待处理任务
                var task = _taskProcessor.GetTask(robotCrane);
                // 优先通过状态中缓存的任务编号查找执行中的任务
                Dt_RobotTask? task = null;
                if (state.CurrentTaskNum.HasValue)
                {
                    task = _taskProcessor.GetTaskByNum(state.CurrentTaskNum.Value);
                }
                // 缓存的任务号未找到对应任务时,按设备编码获取新任务
                task ??= _taskProcessor.GetTask(robotCrane);
                // 如果没有获取到待处理任务,且RobotArmObject为1(有物料),则获取该设备执行中的任务
                if (task == null && state.RobotArmObject == 1)
                {
                    task = _taskProcessor.GetExecutingTask(robotCrane);
                }
                //if (task == null && state.RobotArmObject == 1)
                //{
                //    task = _taskProcessor.GetExecutingTask(robotCrane);
                //}
                // 如果有待处理任务
                if (task != null)