更新代码

wangxinhui

20 小时以前 ff24fa06ba2d3a5e271789b8f81f3a3131d19470

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

@@ -5,19 +5,25 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.Log;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.APIEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_DTO.MES;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ISystemServices;
@@ -43,6 +49,8 @@
        private readonly IDt_StationManagerRepository _stationManagerRepository;
        private readonly IRouterRepository _routerRepository;
        private readonly ITask_HtyRepository _taskHtyRepository;
        private readonly IApiInfoRepository _apiInfoRepository;
        private readonly IUnitOfWorkManage _unitOfWorkManage;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
        {
@@ -56,20 +64,12 @@


        #region èŽ·å–所有任务类型、状态
        public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();

        public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
        public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();

        public List<int> TaskInboundStates => typeof(TaskInStatusEnum).GetEnumIndexList();

        public List<int> TaskOutboundStates => typeof(TaskOutStatusEnum).GetEnumIndexList();
        public List<int> TaskRelocationboundStates => typeof(TaskRelocationStatusEnum).GetEnumIndexList();

        #endregion èŽ·å–所有任务类型、状态


        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository, IApiInfoRepository apiInfoRepository,IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -80,6 +80,8 @@
            _stationManagerRepository = stationManagerRepository;
            _routerRepository = routerRepository;
            _taskHtyRepository = htyRepository;
            _apiInfoRepository = apiInfoRepository;
            _unitOfWorkManage = unitOfWorkManage;
        }

        /// <summary>
@@ -139,13 +141,9 @@
            {
                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutPending;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    task.TaskState = (int)TaskInStatusEnum.InPending;
                    task.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryException;
                }
                task.ExceptionMessage = message;
                task.ModifyDate = DateTime.Now;
@@ -196,29 +194,15 @@
                int oldState = task.TaskState;
                if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAGVCarryStatusEnum>();

                    task.TaskState = nextStatus;

                    if (task.TaskState == (int)TaskOutStatusEnum.AGV_OutFinish)
                    if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
                    {

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                        BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.人工完成 : OperateTypeEnum.自动完成);
                    }
                }
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;

                    
                }
                else
                {
@@ -273,7 +257,7 @@
            {
                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                if (task.TaskState != (int)TaskInStatusEnum.InPending && task.TaskState != (int)TaskOutStatusEnum.OutPending)
                if (task.TaskState != (int)TaskAGVCarryStatusEnum.AGV_CarryException && task.TaskState != (int)TaskAGVCarryStatusEnum.AGV_CarryException)
                {
                    return content = WebResponseContent.Instance.Error($"该任务状态不可恢复,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");
                }
@@ -285,14 +269,7 @@
                }
                else
                {
                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    }
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        task.TaskState = (int)TaskInStatusEnum.InNew;
                    }
                    throw new Exception($"未找到任务号{taskNum}恢复状态");
                }

                task.ExceptionMessage = string.Empty;
@@ -379,5 +356,122 @@


        #endregion é‡å†™æ–¹æ³•

        /// <summary>
        /// æ›´æ–°ä»»åŠ¡ä¿¡æ¯åŠæ·»åŠ ä»»åŠ¡æ˜Žç»†è®°å½•
        /// </summary>
        /// <param name="task">任务原对象实例(未修改的数据对象)</param>
        /// <param name="taskStatus">修改后的任务状态</param>
        /// <param name="deviceCode">修改后的设备编号</param>
        /// <param name="sourceAddress">修改后的起始地址</param>
        /// <param name="targetAddress">修改后的目标地址</param>
        /// <param name="currentAddress">修改后的当前地址</param>
        /// <param name="nextAddress">修改后的下一地址</param>
        public void UpdateTask(Dt_Task task, TaskAGVCarryStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "")
        {
            StringBuilder stringBuilder = new StringBuilder(App.User?.UserId == 0 ? $"系统自动流程" : "人工手动流程");
            if (task.SourceAddress != sourceAddress && !string.IsNullOrEmpty(sourceAddress))
            {
                stringBuilder.Append($",起始地址由{task.SourceAddress}变更为{sourceAddress}");
                task.SourceAddress = sourceAddress;
            }
            if (task.TargetAddress != targetAddress && !string.IsNullOrEmpty(targetAddress))
            {
                stringBuilder.Append($",目标地址由{task.TargetAddress}变更为{targetAddress}");
                task.TargetAddress = targetAddress;
            }
            if (task.CurrentAddress != currentAddress && !string.IsNullOrEmpty(currentAddress))
            {
                stringBuilder.Append($",当前位置由{task.CurrentAddress}变更为{currentAddress}");
                task.CurrentAddress = currentAddress;
            }
            if (task.NextAddress != nextAddress && !string.IsNullOrEmpty(nextAddress))
            {
                stringBuilder.Append($",下一位置由{task.NextAddress}变更为{nextAddress}");
                task.NextAddress = nextAddress;
            }
            if (task.Roadway != roadwayNo && !string.IsNullOrEmpty(roadwayNo))
            {
                stringBuilder.Append($",巷道号由{task.Roadway}变更为{roadwayNo}");
                task.Roadway = roadwayNo;
            }
            if (task.TaskState != taskStatus.ObjToInt())
            {
                string newStatus = $"{taskStatus}";
                try
                {
                    List<int> enums = Enum.GetValues(typeof(TaskAGVCarryStatusEnum)).Cast<int>().ToList();
                    FieldInfo? fieldInfo = typeof(TaskAGVCarryStatusEnum).GetField((taskStatus).ToString());
                    if (fieldInfo != null)
                    {
                        DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                        if (description != null)
                        {
                            newStatus = $"{description.Description}({taskStatus})";
                        }
                    }
                }
                catch { }
                string oldStatus = $"{task.TaskState}";
                try
                {
                    FieldInfo? fieldInfo2 = typeof(RouterInOutType).GetField(((TaskAGVCarryStatusEnum)task.TaskState).ToString());
                    if (fieldInfo2 != null)
                    {
                        DescriptionAttribute? description2 = fieldInfo2.GetCustomAttribute<DescriptionAttribute>();
                        if (description2 != null)
                        {
                            oldStatus = $"{description2.Description}({task.TaskState})";
                        }
                    }
                }
                catch { }
                stringBuilder.Append($",任务状态由{oldStatus}变更为{newStatus}");

                task.TaskState = taskStatus.ObjToInt();
            }
            BaseDal.UpdateData(task);
            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, stringBuilder.ToString());
        }

        // åœ¨ç±»ä¸­æ·»åŠ é™æ€é”å¯¹è±¡
        private static readonly object _taskCompleteLock = new object();

        /// <summary>
        /// ä»»åŠ¡å®Œæˆ
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent TaskCompleted(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();

            // ä½¿ç”¨é”ç¡®ä¿åŒä¸€ä»»åŠ¡ä¸ä¼šå¹¶å‘处理
            lock (_taskCompleteLock)
            {
                try
                {
                    WriteLog.Write_Log("任务完成", "任务完成接口", "任务号", $"任务：{taskNum}");

                    // å†æ¬¡æŸ¥è¯¢ä»»åŠ¡çŠ¶æ€ï¼Œé˜²æ­¢åœ¨é”ç­‰å¾…期间任务状态已改变
                    Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                    if (task == null)
                    {
                        return content.Error($"任务{taskNum}不存在");
                    }
                    //任务完成逻辑
                    _unitOfWorkManage.BeginTran();

                    _unitOfWorkManage.CommitTran();
                    content.OK("任务完成");
                }
                catch (Exception ex)
                {
                    _unitOfWorkManage.RollbackTran();
                    content.Error(ex.Message);
                }
                return content;
            }
        }
    }
}