duyongjia
2025-01-15 f250fe4befac5c9bacaa6eae9fa87738a70663dd
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1149,6 +1149,26 @@
        }
        /// <summary>
        /// å…è®¡é‡ç½®
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent AGVResetTask()
        {
            WebResponseContent content = new WebResponseContent();
            Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == "1");
            if (task != null)
            {
                UpdateTaskAllowIn(task.TaskNum, 0);
            }
            else
            {
                return WebResponseContent.Instance.Error($"目前是允计AGV进入状态,无需重置!");
            }
            return content.Error("重置成功!");
        }
        /// <summary>
        /// ä»»åŠ¡å–æ¶ˆ
        /// </summary>
        /// <param name="taskid"></param>
@@ -1162,6 +1182,12 @@
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                //取消任务时,重置是否允计进入
                if (task.CurrentAddress == "1")
                {
                    UpdateTaskAllowIn(task.TaskNum, 0);
                }
                Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
                Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
                bool isBack = false;