ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -119,6 +119,8 @@
        /// <returns></returns>
        Dt_Task QueryRelocationTask(string deviceNo);

        bool QueryStackerTask(string deviceNo);



        /// <summary>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs

@@ -335,6 +335,27 @@
                            }
                            #endregion

                            #region TaskRelocationStatusEnum
                            {
                                Type type = typeof(TaskRelocationStatusEnum);
                                List<int> enums = Enum.GetValues(typeof(TaskRelocationStatusEnum)).Cast<int>().ToList();
                                int index = 0;
                                foreach (var item in enums)
                                {
                                    FieldInfo? fieldInfo = typeof(TaskRelocationStatusEnum).GetField(((TaskRelocationStatusEnum)item).ToString());
                                    DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                    if (description != null)
                                    {
                                        data.Add(new { key = item.ToString(), value = description.Description });
                                    }
                                    else
                                    {
                                        data.Add(new { key = item.ToString(), value = item.ToString() });
                                    }
                                    index++;
                                }
                            }
                            #endregion
                            #region AGVTaskStatusEnum
                            {
                                Type type = typeof(AGVTaskStatusEnum);
@@ -356,6 +377,7 @@
                                }
                            }
                            #endregion

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -332,6 +332,10 @@

                        Grade = 3,

                        TaskNum = BaseDal.GetTaskNo().Result,

                        PalletCode= taskDTOs.TPbarcode,

                    };
                    BaseDal.AddData(task);
                }
@@ -618,6 +622,15 @@
        {
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew);
        }
        public bool QueryStackerTask(string deviceNo)
        {
            var task= BaseDal.QueryFirst(x => x.Roadway == deviceNo && (x.TaskState == (int)TaskInStatusEnum.SC_InExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting || x.TaskState == (int)TaskRelocationStatusEnum.Relocation_Executing));
            if (task == null)
            {
                return true;
            }
            return false;
        }

        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、排除的任务、当前地址按照优先级以及创建时间排序查询任务池出库类型的新增的所有任务

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -286,6 +286,11 @@
        {
            Dt_Task task;

            if (!_taskService.QueryStackerTask(commonStackerCrane.DeviceCode))
            {
                return null;
            }

            task = _taskService.QueryRelocationTask(commonStackerCrane.DeviceCode);
            if (task != null)
            {