提交

pan

10 天以前 c95029139c278f0d2980e6d67cab42f5331e8d06

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs

@@ -46,8 +46,9 @@
            _logger.LogInformation(" ESSController  ContainerArrivalReport : CallId={CallId},ContainerCode={ContainerCode},SlotCode={SlotCode}", request.CallId, request.ContainerCode, request.SlotCode);
            var response = new ApiResponse<ContainerArrivalResponseData>
            {
                Code = 1
                
                Code = 1,
                Data = null,

            };

            // ç”Ÿæˆè¯·æ±‚的唯一标识（基于callId + æ—¶é—´æˆ³ï¼‰
@@ -76,7 +77,12 @@
                    return Ok(response);
                }

                var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
                WebResponseContent result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
                if (result != null && !string.IsNullOrEmpty(result.Message))
                {
                    _logger.LogError(" ESSController  ContainerArrivalReport  RequestInboundTask: Message={Message}", result?.Message);
                }
             

                var cacheOptions = new MemoryCacheEntryOptions
                {
@@ -87,14 +93,23 @@
                {
                    Code = 0,
                    Msg = "",
                    Data = new ContainerArrivalResponseData
                    Data = null,
                };
                if (result != null && !string.IsNullOrEmpty( result.Message ) && result.Message.Contains("该托盘已生成任务"))
                {

                    response.Data = new ContainerArrivalResponseData
                    {
                        direction = "100"
                    }
                };
                if (result.Status)
                    };
                    return Ok(response);
                }
                if (result != null && result.Status)
                {
                   
                    response.Data = new ContainerArrivalResponseData
                    {
                        direction = "100"
                    };
                    return Ok(response);
                }
                else
@@ -214,7 +229,7 @@
            _logger.LogInformation("任务完成: TaskCode={TaskCode}, Container={Container}, Robot={Robot}",
                request.TaskCode, request.ContainerCode, request.RobotCode);

            _taskService.TaskCompleted(request.TaskCode);
            await _taskService.TaskCompleted(request.TaskCode);
            // æ ¹æ®ä¸åŒçš„任务类型进行特殊处理
            if (request.Weight.HasValue)
            {
@@ -272,8 +287,7 @@
        /// </summary>
        private async Task HandleTaskSuspended(StatusCallbackRequest request)
        {
            _logger.LogWarning("任务挂起: TaskCode={TaskCode}, ç³»ç»Ÿä»»åŠ¡ç ={SysTaskCode}, åŽŸå› ={Message}",
                request.TaskCode, request.SysTaskCode, request.Message);
            _logger.LogWarning("任务挂起: TaskCode={TaskCode}, ç³»ç»Ÿä»»åŠ¡ç ={SysTaskCode}, åŽŸå› ={Message}",request.TaskCode, request.SysTaskCode, request.Message);

            // è¿™é‡Œæ·»åŠ æ‚¨çš„挂起处理逻辑
            await Task.CompletedTask;
@@ -284,8 +298,7 @@
        /// </summary>
        private async Task HandleTaskAllocated(StatusCallbackRequest request)
        {
            _logger.LogInformation("任务分配: TaskCode={TaskCode}, Robot={Robot}",
                request.TaskCode, request.RobotCode);
            _logger.LogInformation("任务分配: TaskCode={TaskCode}, Robot={Robot}",request.TaskCode, request.RobotCode);

            // è¿™é‡Œæ·»åŠ æ‚¨çš„任务分配处理逻辑
            await Task.CompletedTask;
@@ -298,8 +311,9 @@
        {
            if (request.Status == WIDESEA_DTO.Basic.TaskStatus.success)
            {
                _logger.LogInformation("取箱完成: Container={Container}, Location={Location}",
                    request.ContainerCode, request.LocationCode);
                _logger.LogInformation("取箱完成: Container={Container}, Location={Location}", request.ContainerCode, request.LocationCode);

                await _taskService.TaskStatusChange(request.TaskCode, WIDESEA_Common.TaskEnum.TaskStatusEnum.AGV_Pull);
            }
            else
            {
@@ -318,8 +332,8 @@
        {
            if (request.Status == WIDESEA_DTO.Basic.TaskStatus.success)
            {
                _logger.LogInformation("放箱完成: Container={Container}, Location={Location}",
                    request.ContainerCode, request.LocationCode);
                _logger.LogInformation("放箱完成: Container={Container}, Location={Location}", request.ContainerCode, request.LocationCode);
                await _taskService.TaskStatusChange(request.TaskCode, WIDESEA_Common.TaskEnum.TaskStatusEnum.AGV_Puting);
            }
            else
            {