wanshenmean
16 小时以前 2f7c7a0621ee2e84c47ccd054889a71e8ce4fdd0
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotPrefixCommandHandler.cs
@@ -145,20 +145,27 @@
                // 从数据库重新查询当前任务(确保获取最新状态)
                var task = await _robotTaskService.Repository.QueryFirstAsync(x => x.RobotTaskId == state.CurrentTask.RobotTaskId);
                // 根据命令前缀分发处理
                if (cmd.StartsWith("pickfinished"))
                if (task != null)
                {
                    // 处理取货完成
                    await HandlePickFinishedAsync(state, positions, task);
                }
                else if (cmd.StartsWith("putfinished"))
                {
                    // 处理放货完成
                    await HandlePutFinishedAsync(state, positions, task);
                }
                    // 根据命令前缀分发处理
                    if (cmd.StartsWith("pickfinished"))
                    {
                        // 处理取货完成
                        await HandlePickFinishedAsync(state, positions, task);
                    }
                    else if (cmd.StartsWith("putfinished"))
                    {
                        // 处理放货完成
                        await HandlePutFinishedAsync(state, positions, task);
                    }
                // 回写原消息到客户端(保持原有行为)
                await _socketClientGateway.SendMessageAsync(client, message);
                    // 回写原消息到客户端(保持原有行为)
                    await _socketClientGateway.SendMessageAsync(client, message);
                }
                else
                {
                    Console.WriteLine($"RobotJob HandleAsync Warning: Current task not found for RobotTaskId {state.CurrentTask.RobotTaskId}");
                }
            }
            catch (Exception ex)
            {
@@ -263,28 +270,47 @@
                    // 换盘任务:根据阶段区分处理
                    if (state.ChangePalletPhase == 2)
                    {
                        // Phase 2:放正常电芯到目标托盘完成,递增计数
                        state.RobotTaskTotalNum += positions.Length;
                        if (task != null)
                            task.RobotTaskTotalNum -= positions.Length;
                        if (isFlowA)
                        {
                            // 流向A Phase2:放假电芯到目标托盘,不调用 API,不递增计数
                            // 仅更新状态
                            // 流向A:不调用 API,仅递增计数
                        }
                        else
                        {
                            // 流向B Phase2:放正常电芯,递增计数
                            state.RobotTaskTotalNum += positions.Length;
                            if (task != null)
                                task.RobotTaskTotalNum -= positions.Length;
                            // 构建库存 DTO 并调用 ChangePalletAsync API
                            // 流向B:调用换盘 API
                            var stockDTO = RobotTaskProcessor.BuildStockDTO(state, positions);
                            var result = _taskProcessor.PostGroupPalletAsync(nameof(ConfigKey.ChangePalletAsync), stockDTO);
                            putSuccess = result.Data.Status && result.IsSuccess;
                        }
                        // 切回 Phase 1,继续取正常电芯
                        state.ChangePalletPhase = 1;
                    }
                    else if (state.ChangePalletPhase == 4)
                    {
                        // 流向B Phase4:放假电芯到5号位,不调用 API,不递增计数,释放点位
                        _fakeBatteryPositionService.MarkAsAvailable(positions.ToList());
                        if (isFlowA)
                        {
                            // 流向A:放假电芯到目标托盘,递增计数,调用换盘 API
                            state.RobotTaskTotalNum += positions.Length;
                            if (task != null)
                                task.RobotTaskTotalNum -= positions.Length;
                            var stockDTO = RobotTaskProcessor.BuildStockDTO(state, positions);
                            var result = _taskProcessor.PostGroupPalletAsync(nameof(ConfigKey.ChangePalletAsync), stockDTO);
                            putSuccess = result.Data.Status && result.IsSuccess;
                        }
                        else
                        {
                            // 流向B:放假电芯到5号位,释放点位
                            _fakeBatteryPositionService.MarkAsAvailable(positions.ToList());
                        }
                        // 切回 Phase 3,继续取假电芯
                        state.ChangePalletPhase = 3;
                    }
                    else
                    {
@@ -306,9 +332,12 @@
                    putSuccess = result.Data.Status && result.IsSuccess;
                    // 增加任务计数
                    state.RobotTaskTotalNum += positions.Length;
                    if (task != null)
                        task.RobotTaskTotalNum -= positions.Length;
                    if (!state.IsScanNG)
                    {
                        state.RobotTaskTotalNum += positions.Length;
                        if (task != null)
                            task.RobotTaskTotalNum -= positions.Length;
                    }
                }
            }
@@ -317,6 +346,7 @@
            {
                // 更新当前动作为"放货完成"
                state.CurrentAction = "PutFinished";
                state.IsScanNG = false;
                // 非组盘任务时增加计数(组盘任务已在上面递增)
                if (!state.IsGroupPallet)
@@ -325,18 +355,18 @@
                    if (task != null)
                        task.RobotTaskTotalNum -= positions.Length;
                }
            }
            // 如果任务存在
            if (task != null)
            {
                // 更新任务状态为"机器人放货完成"
                task.RobotTaskState = TaskRobotStatusEnum.RobotPutFinish.GetHashCode();
                // 安全更新状态到 Redis
                if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
                // 如果任务存在
                if (task != null)
                {
                    await _robotTaskService.Repository.UpdateDataAsync(task);
                    // 更新任务状态为"机器人放货完成"
                    task.RobotTaskState = TaskRobotStatusEnum.RobotPutFinish.GetHashCode();
                    // 安全更新状态到 Redis
                    if (_stateManager.TryUpdateStateSafely(state.IPAddress, state))
                    {
                        await _robotTaskService.Repository.UpdateDataAsync(task);
                    }
                }
            }
        }