Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/³ÉÆ·²Ö/AGV_CPExtend.cs

@@ -29,14 +29,14 @@
                    {
                        try
                        {
                            if (task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
                            if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                                task.CurrentAddress = GetAGVAddress(task.CurrentAddress);
                            else
                                task.NextAddress = GetAGVAddress(task.NextAddress);
                            AgvTaskDTO taskDTO = new AgvTaskDTO()
                            {
                                TaskCode = task.AgvTaskNum,
                                ReqCode = DateTime.Now.ToString("yyyyMMdd") + task.AgvTaskNum,
                                ReqCode = DateTime.Now.ToString("yyMMdd") + task.AgvTaskNum,
                                TaskTyp = task.TaskType < TaskTypeEnum.Inbound.ObjToInt() ? "CPC" : "CPR",
                                ctnrCode = task.PalletCode,
                                PositionCodePath = new List<CodePath>()
@@ -60,6 +60,10 @@
                            if (task.GroupId.IsNotEmptyOrNull())
                            {
                                taskDTO.GroupId=task.GroupId;
                            }
                            if (task.TaskType==TaskTypeEnum.OutMesRworkProduct.ObjToInt())
                            {
                                taskDTO.Priority = "127";
                            }
                            //发送AGV任务
                            WebResponseContent content = _taskService.AgvSendTask(taskDTO, APIEnum.Agv_CPSendTask);
@@ -100,7 +104,7 @@
                            AgvTaskDTO taskDTO = new AgvTaskDTO()
                            {
                                TaskCode = task.AgvTaskNum,
                                ReqCode = DateTime.Now.ToString("yyyyMMdd") + task.AgvTaskNum,
                                ReqCode = DateTime.Now.ToString("yyMMdd") + task.AgvTaskNum,
                                TaskTyp = "CP",
                                ctnrCode = task.PalletCode,
                                PositionCodePath = new List<CodePath>()