From b7796f5e4d6594976ea948905af769eca863f27c Mon Sep 17 00:00:00 2001 From: helongyang <647556386@qq.com> Date: 星期一, 07 七月 2025 15:28:15 +0800 Subject: [PATCH] 代码更新 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/阻焊仓/AGV_ZHExtend.cs | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs" index a4da7dd..9d6beb7 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs" @@ -43,7 +43,7 @@ }, new CodePath() { - type="00", + type="04", positionCode=agvTask.NextAddress } }, @@ -90,6 +90,7 @@ var WaitToTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt() && nameof(AGV_ZHJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList(); foreach (var WaitToTask in WaitToTasks) { + AgvSecureReplyDTO replyDTO = new AgvSecureReplyDTO(); if (WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) { if (WaitToTasks.FirstOrDefault(x => x.TaskState == TaskStatusEnum.AGV_Puting.ObjToInt() || x.TaskState == TaskStatusEnum.Finish.ObjToInt()) != null) @@ -119,6 +120,14 @@ continue; } otherDevice.SetValue(GroundStationDBName.W_PutPalletType, WaitToTask.PalletType, stationManger.StationCode); + + replyDTO.ReqCode = Guid.NewGuid().ToString().Replace("-", "");//WaitToTask.TaskNum.ToString(), + replyDTO.taskCode = WaitToTask.AgvTaskNum; + replyDTO.nextPositionCode = new CodePath() + { + type="00", + positionCode= stationManger.AGVStationCode + }; } else { @@ -144,13 +153,9 @@ { continue; } + replyDTO.ReqCode = Guid.NewGuid().ToString().Replace("-", "");//WaitToTask.TaskNum.ToString(), + replyDTO.taskCode = WaitToTask.AgvTaskNum; } - - AgvSecureReplyDTO replyDTO = new AgvSecureReplyDTO() - { - ReqCode = Guid.NewGuid().ToString().Replace("-", ""), //WaitToTask.TaskNum.ToString(), - taskCode = WaitToTask.AgvTaskNum, - }; WebResponseContent content = _taskService.AgvSecureReply(replyDTO); if (content.Status && WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) { -- Gitblit v1.9.3