111

chenyong

2026-03-06 9051d96029c8e860c6e6657b7df2106bfbfdc010

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

@@ -47,7 +47,8 @@
        private readonly IRepository<Dt_Router> _routerRepository;
        private readonly IRepository<Dt_StationManger> _stationMangerRepository;
        private readonly IMapper _mapper;
        
        private readonly ITaskHtyService _taskHtyService;


        private Dictionary<string, OrderByType> _taskOrderBy = new()
            {
@@ -69,7 +70,7 @@
        /// </summary>
        public IRepository<Dt_Task> Repository => BaseDal;

        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository) : base(BaseDal)
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository, ITaskHtyService taskHtyService) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -78,6 +79,7 @@
            _mapper = mapper;
            _routerRepository = routerRepository;
            _stationMangerRepository = stationMangerRepository;
            _taskHtyService = taskHtyService;
        }

        /// <summary>
@@ -197,7 +199,7 @@
        /// <returns></returns>
        public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress)
        {
            return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) &&  TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
            return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
        }

        /// <summary>
@@ -233,7 +235,7 @@
            if (taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
                return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskInboundTypes.Contains(x.TaskType), TaskOrderBy);
            if (taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
                return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskOutboundTypes.Contains(x.TaskType) , TaskOrderBy);
                return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskOutboundTypes.Contains(x.TaskType), TaskOrderBy);
            return null;
        }
        /// <summary>
@@ -293,7 +295,7 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryStackerCraneInTask(string deviceNo, string currentAddress = "")
        {
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType== (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
        }

        /// <summary>
@@ -304,7 +306,7 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryStackerCraneOutTask(string deviceNo, string currentAddress = "")
        {
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType==(int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
        }

        /// <summary>
@@ -407,7 +409,7 @@

                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                    if (task.TaskState ==(int)TaskOutStatusEnum.SC_OutFinish)
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
                    {
                        task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
                    }
@@ -449,7 +451,7 @@

                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                bool res  = BaseDal.UpdateData(task);
                bool res = BaseDal.UpdateData(task);
                if (!res)
                {
                    return content = WebResponseContent.Instance.Error($"更新任务信息失败,任务号:【{task.TaskNum}】");
@@ -570,10 +572,10 @@
                if (task == null) return false;

                // éªŒè¯ä»»åŠ¡çŠ¶æ€æ˜¯å¦å…è®¸å®Œæˆ
                if (!IsTaskStateValidForCompletion(task))return false;
                if (!IsTaskStateValidForCompletion(task)) return false;

                // æ ¹æ®ä»»åŠ¡ç±»åž‹å¤„理
                 res = ProcessTaskCompletion(task);
                res = ProcessTaskCompletion(task);
            }
            catch (Exception ex)
            {
@@ -654,9 +656,8 @@
            BaseDal.UpdateData(task);

            // æ·»åŠ å…¥åº“历史记录
            // _task_HtyService.AddTaskHty(task);
            _taskHtyService.AddTaskHistory(task);
            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "入库完成");
            //AddTaskHistory(task);

            // å…¥åº“完成后删除任务
            bool res = BaseDal.DeleteData(task);
@@ -692,7 +693,7 @@
                if (!response.Status)
                {
                    // è®°å½•é€šçŸ¥å¤±è´¥æ—¥å¿—，但不影响主流程
                     //_logger.Warn($"任务完成通知失败,任务号:【{taskNum}】,响应:【{response.Message}】");
                    //_logger.Warn($"任务完成通知失败,任务号:【{taskNum}】,响应:【{response.Message}】");
                }
            }
            catch (Exception ex)
@@ -798,7 +799,7 @@
        {
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == Pallat && x.SourceAddress== StationCode);
                Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == Pallat && x.SourceAddress == StationCode);
                if (task != null)
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
@@ -857,7 +858,7 @@

        public Dt_Task GetOutTaskInfo(string PLCaddress)
        {
            return BaseDal.QueryFirst(x => x.TargetAddress== PLCaddress && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
            return BaseDal.QueryFirst(x => x.TargetAddress == PLCaddress && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
        }

        public Dt_Task GetOutTaskInfo2(string PalletCode)
@@ -874,10 +875,10 @@
        public WebResponseContent WCSCancelinventory(int taskNum)
        {
            //查询任务信息
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && (x.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() || x.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() || x.TaskState == TaskInStatusEnum.Line_InExecuting.ObjToInt()));
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}或状态不对】");
            bool taskmsseg = BaseDal.DeleteData(task);
            bool res = AddTaskHistory(task,"手动取消");
            bool res = AddTaskHistory(task, "手动取消");
            return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();

        }
@@ -887,7 +888,7 @@
        /// </summary>
        /// <param name="task">任务对象</param>
        /// <returns>是否添加成功</returns>
        public static bool AddTaskHistory(Dt_Task task,string operateType)
        public bool AddTaskHistory(Dt_Task task, string operateType)
        {
            try
            {
@@ -897,15 +898,15 @@
                }

                // åˆ›å»ºä»»åŠ¡åŽ†å²æœåŠ¡å®žä¾‹
                var taskHtyService = App.GetService<ITaskHtyService>();
                if (taskHtyService == null)
                {
                    return false;
                }
                //var taskHtyService = App.GetService<ITaskHtyService>();
                //if (taskHtyService == null)
                //{
                //    return false;
                //}

                // æ·»åŠ åŽ†å²è®°å½•
                bool result = taskHtyService.AddTaskHistory(task, operateType);
                
                bool result = _taskHtyService.AddTaskHistory(task, operateType);

                return result;
            }
            catch (Exception ex)
@@ -928,10 +929,156 @@
        {
            //查询任务信息
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
            if (task == null) return WebResponseContent.Instance.OK();
            bool taskmsseg = BaseDal.DeleteData(task);
            bool res = AddTaskHistory(task, "手动完成");
            return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
        }

        public bool GetYK(string sc)
        {
            Dt_Task dt_Task = BaseDal.QueryFirst(x => x.Roadway == sc && x.TaskType == (int)TaskRelocationTypeEnum.Relocation);
            if (dt_Task != null)
            {
                return true;
            }
            else
            {
                return false;
            }
        }

        /// <summary>
        /// èŽ·å–巷道任务进度
        /// </summary>
        /// <param name="roadway">巷道编号</param>
        /// <returns></returns>
        public WebResponseContent GetRoadwayTaskProgress(string roadway)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var tasks = BaseDal.QueryData(x => x.Roadway == roadway);
                var progressInfo = new
                {
                    roadway = roadway,
                    totalTasks = tasks.Count,
                    inProgressTasks = tasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
                    completedTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
                    cancelledTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
                    exceptionTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception),
                    tasks = tasks.Select(t => new
                    {
                        taskNum = t.TaskNum,
                        taskType = t.TaskType,
                        taskState = t.TaskState,
                        taskStateName = GetTaskStateName(t.TaskState),
                        createDate = t.CreateDate,
                        modifyDate = t.ModifyDate,
                        sourceAddress = t.SourceAddress,
                        targetAddress = t.TargetAddress
                    }).ToList()
                };
                content = WebResponseContent.Instance.OK(data: progressInfo);
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// èŽ·å–所有巷道任务进度
        /// </summary>
        /// <returns></returns>
        public WebResponseContent GetAllRoadwayTaskProgress()
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var allTasks = BaseDal.QueryData();
                var roadways = allTasks.Select(t => t.Roadway).Distinct().ToList();
                var progressList = new List<object>();

                foreach (var roadway in roadways)
                {
                    var roadwayTasks = allTasks.Where(t => t.Roadway == roadway).ToList();
                    progressList.Add(new
                    {
                        roadway = roadway,
                        totalTasks = roadwayTasks.Count,
                        inProgressTasks = roadwayTasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
                        completedTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
                        cancelledTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
                        exceptionTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception)
                    });
                }

                content = WebResponseContent.Instance.OK(data: progressList);
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// èŽ·å–任务状态名称
        /// </summary>
        /// <param name="taskState">任务状态值</param>
        /// <returns></returns>
        private string GetTaskStateName(int taskState)
        {
            // ç›´æŽ¥æ ¹æ®çŠ¶æ€å€¼è¿”回状态名称
            switch (taskState)
            {
                case (int)TaskStatusEnum.New:
                    return "新建";
                case (int)TaskStatusEnum.HT_Executing:
                    return "提升机执行中";
                case (int)TaskStatusEnum.SC_Execute:
                    return "堆垛机待执行";
                case (int)TaskStatusEnum.SC_Executing:
                    return "堆垛机执行中";
                case (int)TaskStatusEnum.SC_Finish:
                    return "堆垛机完成";
                case (int)TaskStatusEnum.Line_Execute:
                    return "输送线待执行";
                case (int)TaskStatusEnum.Line_Executing:
                    return "输送线执行中";
                case (int)TaskStatusEnum.Line_Finish:
                    return "输送线完成";
                case (int)TaskStatusEnum.RGV_NEW:
                    return "RGV新建任务";
                case (int)TaskStatusEnum.RGV_Execute:
                    return "RGV待执行";
                case (int)TaskStatusEnum.RGV_Takeing:
                    return "RGV取货中";
                case (int)TaskStatusEnum.RGV_Executing:
                    return "RGV执行中";
                case (int)TaskStatusEnum.RGV_WaitToExecute:
                    return "RGV待继续执行";
                case (int)TaskStatusEnum.RGV_Puting:
                    return "RGV放货中";
                case (int)TaskStatusEnum.RGV_Finish:
                    return "RGV完成";
                case (int)TaskStatusEnum.RGV_TakeError:
                    return "RGV取货写入异常";
                case (int)TaskStatusEnum.Finish:
                    return "任务完成";
                case (int)TaskStatusEnum.Pending:
                    return "任务挂起";
                case (int)TaskStatusEnum.MesPending:
                    return "Mes出库挂起";
                case (int)TaskStatusEnum.Cancel:
                    return "任务取消";
                case (int)TaskStatusEnum.Exception:
                    return "任务异常";
                default:
                    return "未知状态";
            }
        }
    }
}