任务表添加AGV任务号(AGV-年月日+任务号)，修改测试架仓AGV交互逻辑

dengjunjie

2024-12-29 7f078e66be9959d94fc78344f195b7b4656812be

任务表添加AGV任务号(AGV-年月日+任务号)，修改测试架仓AGV交互逻辑

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs

@@ -19,11 +19,11 @@
        /// <summary>
        /// ä½ç½®X坐标 ä»»åŠ¡å®Œæˆæ—¶æœ‰å€¼
        /// </summary>
        public int CooX { get; set; }
        public double CooX { get; set; }
        /// <summary>
        /// ä½ç½®Y坐标 ä»»åŠ¡å®Œæˆæ—¶æœ‰å€¼
        /// </summary>
        public int CooY { get; set; }
        public double CooY { get; set; }
        /// <summary>
        /// å½“前位置编号<br/>
        /// ä»»åŠ¡å¼€å§‹ï¼šè¯¥ä½ç½®ä¸ºä»»åŠ¡èµ·ç‚¹<br/>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs

@@ -85,8 +85,8 @@
            {
                if (agvUpdateModel == null) throw new Exception("未获取到请求参数");
                agvResponseContent.ReqCode = agvUpdateModel.ReqCode;
                var task = _taskRepository.QueryFirst(x => agvUpdateModel.TaskCode.ObjToInt() == x.TaskNum);
                if (task == null) throw new Exception("未找到任务");
                var task = _taskRepository.QueryFirst(x => agvUpdateModel.TaskCode == x.AgvTaskNum);
                if (task == null) throw new Exception($"未找到任务,任务号【{agvUpdateModel.TaskCode}】");
                switch (agvUpdateModel.Method)
                {
                    case "start":
@@ -104,6 +104,24 @@
                            return agvResponseContent;
                        }
                        break;
                    case "getSafetySignal"://安全信号申请
                        {
                            if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
                            {
                                var content = TakeRequest(task.CurrentAddress);
                                if (!content.Status) throw new Exception(content.Message);
                            }
                            else
                            {
                                var content = PutRequest(task.NextAddress, task.PalletType);
                                if (!content.Status) throw new Exception(content.Message);
                            }
                            task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
                            var up = _taskRepository.UpdateData(task);
                            agvResponseContent.Code = up ? "0" : "1";
                            agvResponseContent.Message = up ? "成功" : "失败";
                            return agvResponseContent;
                        }
                    case "end"://入库根据这个信号判断放货完成
                        if (task.TaskType != TaskTypeEnum.Outbound.ObjToInt())
                        {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -161,7 +161,7 @@

                    if (string.IsNullOrEmpty(item.AGVArea))
                    {
                        task.AgvTaskNum = "AGV-" + item.TaskNum;
                        task.AgvTaskNum = "AGV-" + DateTime.Now.ToString("YYMMDD") + item.TaskNum;
                        Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == item.SourceAddress || x.StackerCraneCode == item.RoadWay);
                        if (stationManger == null)
                        {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs

@@ -40,14 +40,14 @@
                                positionCode=agvTask.NextAddress
                            }
                        },
                        TaskCode = agvTask.TaskNum.ToString(),
                        PodTyp = agvTask.PalletType == 1 ? "XX" : "DD",
                        TaskCode = agvTask.AgvTaskNum,
                        PodTyp = agvTask.PalletType < 3 ? "XX" : "DD",
                    };
                    WebResponseContent content = _taskService.AgvSendTask(taskDTO);
                    if (content.Status)
                    {
                        agvTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
                        agvTask.Remark = content.Data.ObjToString();
                        //agvTask.Remark = content.Data.ObjToString();
                    }
                    else
                    {
@@ -76,7 +76,7 @@
                    AgvSecureReplyDTO replyDTO = new AgvSecureReplyDTO()
                    {
                        ReqCode = Guid.NewGuid().ToString().Replace("-", ""), //WaitToTask.TaskNum.ToString(),
                        taskCode = WaitToTask.Remark,
                        taskCode = WaitToTask.AgvTaskNum,
                    };
                    WebResponseContent content = _taskService.AgvSecureReply(replyDTO);
                    if (content.Status)