From 6cb85536a0b7edf936cfc7b68502c858068c140f Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期三, 10 十二月 2025 16:15:46 +0800
Subject: [PATCH] 在WCS中添加监控堆垛机和提升机状态和报警信息功能
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index 795c224..c6d4fb6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -35,10 +35,12 @@
public class TaskExecuteDetailService : ServiceBase<Dt_TaskExecuteDetail, ITaskExecuteDetailRepository>, ITaskExecuteDetailService
{
private readonly ITaskRepository _taskRepository;
+ private readonly ITask_HtyRepository _task_htyRepository;
- public TaskExecuteDetailService(ITaskExecuteDetailRepository BaseDal, ITaskRepository taskRepository) : base(BaseDal)
+ public TaskExecuteDetailService(ITaskExecuteDetailRepository BaseDal, ITaskRepository taskRepository, ITask_HtyRepository task_HtyRepository) : base(BaseDal)
{
_taskRepository = taskRepository;
+ _task_htyRepository = task_HtyRepository;
}
public void AddTaskExecuteDetail(int taskId, string description = "")
@@ -245,18 +247,27 @@
return content;
}
+
+
public WebResponseContent GetDetailDatas(int taskNum)
{
WebResponseContent content = new();
try
{
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task_Hty task_Hty = _task_htyRepository.QueryFirst(x => x.TaskNum == taskNum);
if (task != null)
{
List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskId == task.TaskId, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
content = WebResponseContent.Instance.OK(data: taskExecuteDetails);
}
+ else if (task_Hty != null)
+ {
+ List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskNum == taskNum, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
+
+ content = WebResponseContent.Instance.OK(data: taskExecuteDetails);
+ }
else
{
content = WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
--
Gitblit v1.9.3