1

huanghongfeng

10 小时以前 9c3ee278c31a79e2e36b635651cef0b2dd431260

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

@@ -46,32 +46,33 @@

        public void AddTaskExecuteDetail(int taskId, string description = "")
        {
            try
            {
                bool isNormal = true;
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
                if (task == null) return;
                int taskNum = task.TaskNum;
                int taskState = task.TaskState;
            bool isNormal = true;
            Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
            if (task == null) return;
            int taskNum = task.TaskNum;
            int taskState = task.TaskState;
            int TaskStateremark = task.RGVTaskType; //新增RGv任务类型

               
                Dt_TaskExecuteDetail taskExecuteDetail = new()
                {
                    IsManual = App.User.UserId > 0,
                    IsNormal = isNormal,
                    TaskNum = taskNum,
                    TaskId = taskId,
                    TaskState = taskState,
                    Description = description,
                    CurrentAddress = task.CurrentAddress,
                    NextAddress = task.NextAddress,
                };
                BaseDal.AddData(taskExecuteDetail);
            }
            catch (Exception ex)
            {
            string getstastr = GetEnumDescription(taskState);
            string getrgvtasktyperema = GetEnumDescription2(TaskStateremark);

            }

            Dt_TaskExecuteDetail taskExecuteDetail = new()
            {
                IsManual = App.User.UserId > 0,
                IsNormal = isNormal,
                TaskNum = taskNum,
                TaskId = taskId,
                TaskState = taskState,
                Description = description,
                CurrentAddress = task.CurrentAddress,
                NextAddress = task.NextAddress,
                Roadway = task.Roadway,   //新增执行设备
                RGVTaskType = TaskStateremark,
                TaskStateremark = getstastr,
                RGVTaskTyperemark = getrgvtasktyperema
            };
            BaseDal.AddData(taskExecuteDetail);
        }

        public void AddTaskExecuteDetail(List<int> taskNums, string description = "")
@@ -173,7 +174,7 @@
                    }
                    else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(TaskType.ToString()).ToString(), out result))
                    {
                        steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
                        steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InPending).ToList();
                        foreach (var item in steps)
                        {
                            object obj;
@@ -202,8 +203,9 @@
                    active = steps.IndexOf(TaskState) + 1;

                }

                content = WebResponseContent.Instance.OK(data: new { active, list });
                string curradd = task.CurrentAddress;
                string nextadd = task.NextAddress;
                content = WebResponseContent.Instance.OK(data: new { active, list,curradd, nextadd });
            }
            catch (Exception ex)
            {
@@ -217,10 +219,31 @@
            WebResponseContent content = new();
            try
            {
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
                //Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);


                Dt_Task task = _taskRepository.QueryData().Where(x => x.TaskNum == taskNum).FirstOrDefault();

                int TaskNum = 0;

                Dt_Task_hty task_h = null;
                if (task != null)
                {
                    List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskId == task.TaskId, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
                    TaskNum = task.TaskNum;
                }
                else if (task == null)
                {
                    task_h = _task_Hty.QueryData().Where(x => x.TaskNum == taskNum).FirstOrDefault();
                    TaskNum = task_h.TaskNum;
                }
                else
                {
                    return content.Error("任务不存在");
                }

                if (task != null || task_h != null)
                {
                    List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskNum == TaskNum, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });

                    content = WebResponseContent.Instance.OK(data: taskExecuteDetails);
                }
@@ -235,5 +258,48 @@
            }
            return content;
        }





        /// <summary>
        /// ä»»åŠ¡ç±»åž‹æžšä¸¾
        /// </summary>
        public string GetEnumDescription(int enumValue)
        {
            var enumType = typeof(TaskInStatusEnum);
            var field = enumType.GetFields()
                               .FirstOrDefault(f => f.FieldType == enumType &&
                                                   (int)f.GetValue(null) == enumValue);

            if (field != null)
            {
                var descriptionAttribute = field.GetCustomAttributes(typeof(DescriptionAttribute), false)
                                              .FirstOrDefault() as DescriptionAttribute;

                return descriptionAttribute?.Description ?? field.Name;
            }

            return string.Empty;
        }

        public string GetEnumDescription2(int enumValue)
        {
            var enumType = typeof(RGVTaskTypeEnum);
            var field = enumType.GetFields()
                               .FirstOrDefault(f => f.FieldType == enumType &&
                                                   (int)f.GetValue(null) == enumValue);

            if (field != null)
            {
                var descriptionAttribute = field.GetCustomAttributes(typeof(DescriptionAttribute), false)
                                              .FirstOrDefault() as DescriptionAttribute;

                return descriptionAttribute?.Description ?? field.Name;
            }

            return string.Empty;
        }
    }
}