添加日志信息

xby-y

6 天以前 b3ff80e45d24a821ca0731983b1546b48570cdf1

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

@@ -199,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>
@@ -235,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>
@@ -295,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>
@@ -306,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>
@@ -409,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;
                    }
@@ -451,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}】");
@@ -572,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)
            {
@@ -640,10 +640,12 @@
        {
            task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
            bool res = BaseDal.UpdateData(task);
            // æ·»åŠ å…¥åº“历史记录
            //AddTaskHistory(task);


            //task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
            //BaseDal.UpdateData(task);
            //// æ·»åŠ å‡ºåº“历史记录
            //_taskHtyService.AddTaskHistory(task);
            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "自动完成");
            //bool res = BaseDal.DeleteData(task);
            return res;
        }

@@ -693,7 +695,7 @@
                if (!response.Status)
                {
                    // è®°å½•é€šçŸ¥å¤±è´¥æ—¥å¿—，但不影响主流程
                     //_logger.Warn($"任务完成通知失败,任务号:【{taskNum}】,响应:【{response.Message}】");
                    //_logger.Warn($"任务完成通知失败,任务号:【{taskNum}】,响应:【{response.Message}】");
                }
            }
            catch (Exception ex)
@@ -799,7 +801,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;
@@ -842,6 +844,7 @@
                    if (task.TaskNum != _Task.TaskNum)
                    {
                        task.Grade = 3;
                        task.TaskState = TaskRelocationStatusEnum.RelocationNew.ObjToInt();
                        BaseDal.AddData(task);
                        return task;
                    }
@@ -858,7 +861,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)
@@ -878,7 +881,7 @@
            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();

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

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

                return result;
            }
            catch (Exception ex)
@@ -934,5 +937,206 @@
            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)
        {
            try
            {
                // 1. å…¥å‚校验
                if (string.IsNullOrWhiteSpace(roadway))
                {
                    return WebResponseContent.Instance.Error("巷道编号不能为空");
                }
                // 2. ä¸€æ¬¡æŸ¥è¯¢ï¼Œé¿å…å¤šæ¬¡æ•°æ®åº“/内存遍历
               List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();

                int totalTasks = taskList.Count;
                int inProgressTasks = 0;
                int completedTasks = 0;
                int cancelledTasks = 0;
                int exceptionTasks = 0;

                foreach (var task in taskList)
                {
                    switch ((TaskStatusEnum)task.TaskState)
                    {
                        case TaskStatusEnum.Finish:
                            completedTasks++;
                            break;
                        case TaskStatusEnum.Cancel:
                            cancelledTasks++;
                            break;
                        case TaskStatusEnum.Exception:
                            exceptionTasks++;
                            break;
                        default:
                            inProgressTasks++;
                            break;
                    }
                }

                var taskDetails = taskList.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();

                // 5. ç»Ÿä¸€è¿”回结果
                var progressInfo = new
                {
                    roadway = roadway,
                    totalTasks,
                    inProgressTasks,
                    completedTasks,
                    cancelledTasks,
                    exceptionTasks,
                    tasks = taskDetails
                };

                return WebResponseContent.Instance.OK(data: progressInfo);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error($"获取巷道任务进度失败：{ex.Message}");
            }
        }

        /// <summary>
        /// èŽ·å–所有巷道任务进度
        /// </summary>
        /// <returns></returns>
        public WebResponseContent GetAllRoadwayTaskProgress()
        {
            try
            {
                // 1. ä¸€æ¬¡æ€§æŸ¥è¯¢æ‰€æœ‰æ•°æ®ï¼ˆé¿å…å¤šæ¬¡æŸ¥è¯¢ï¼‰
                List<Dt_Task> allTasks = BaseDal.QueryData().ToList();

                // 2. æŒ‰å··é“分组 + ä¸€æ¬¡éåŽ†ç»Ÿè®¡æ‰€æœ‰çŠ¶æ€ï¼ˆæ€§èƒ½æå‡å·¨å¤§ï¼‰
                var progressList = allTasks
                    .GroupBy(t => t.Roadway)
                    .Select(group =>
                    {
                        var roadway = group.Key;
                        var tasks = group.ToList();
                        var totalTasks = tasks.Count;
                        int inProgress = 0, completed = 0, cancelled = 0, exception = 0;

                        foreach (var task in tasks)
                        {
                            switch ((TaskStatusEnum)task.TaskState)
                            {
                                case TaskStatusEnum.Finish:
                                    completed++;
                                    break;
                                case TaskStatusEnum.Cancel:
                                    cancelled++;
                                    break;
                                case TaskStatusEnum.Exception:
                                    exception++;
                                    break;
                                default:
                                    inProgress++;
                                    break;
                            }
                        }
                        return new
                        {
                            roadway = roadway,
                            totalTasks = totalTasks,
                            inProgressTasks = inProgress,
                            completedTasks = completed,
                            cancelledTasks = cancelled,
                            exceptionTasks = exception
                        };
                    })
                    .ToList();
                return WebResponseContent.Instance.OK(data: progressList);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error($"获取巷道任务进度失败：{ex.Message}");
            }
        }

        /// <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 "未知状态";
            }
        }
    }
}