From 78d5eca8ea11c60ac88ebf133329fddad7c2aad2 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 10:20:26 +0800
Subject: [PATCH] 任务
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index 4c73d11..719fc3a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -173,7 +173,7 @@
}
else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(TaskType.ToString()).ToString(), out result))
{
- steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
+ steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InPending).ToList();
foreach (var item in steps)
{
object obj;
@@ -217,10 +217,31 @@
WebResponseContent content = new();
try
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ //Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+
+
+ Dt_Task task = _taskRepository.QueryData().Where(x => x.TaskNum == taskNum).FirstOrDefault();
+
+ int TaskNum = 0;
+
+ Dt_Task_hty task_h = null;
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 } });
+ TaskNum = task.TaskNum;
+ }
+ else if (task == null)
+ {
+ task_h = _task_Hty.QueryData().Where(x => x.TaskNum == taskNum).FirstOrDefault();
+ TaskNum = task_h.TaskNum;
+ }
+ else
+ {
+ return content.Error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ if (task != null || task_h != 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);
}
--
Gitblit v1.9.3