From 6e9f630e4e12738d98241b684e6227e02010b6c5 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期五, 01 十一月 2024 17:30:30 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index d2e92d9..e34f30e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -22,6 +22,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.Enums;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
@@ -48,14 +49,14 @@
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
if (task == null) return;
int taskNum = task.TaskNum;
- int taskState = task.TaskState;
+ int TaskStatus = task.TaskStatus;
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
+ if (!int.TryParse(Enum.Parse<OutTaskStatusEnum>(TaskStatus.ToString()).ToString(), out int result))
{
if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish)
isNormal = false;
}
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<InTaskStatusEnum>(TaskStatus.ToString()).ToString(), out result))
{
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
isNormal = false;
@@ -66,7 +67,7 @@
IsNormal = isNormal,
TaskNum = taskNum,
TaskId = taskId,
- TaskState = taskState,
+ TaskState = TaskStatus,
Description = description,
CurrentAddress = task.CurrentAddress,
NextAddress = task.NextAddress,
@@ -90,14 +91,14 @@
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == item);
if (task == null) return;
int taskNum = task.TaskNum;
- int taskState = task.TaskState;
+ int TaskStatus = task.TaskStatus;
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
+ if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(TaskStatus.ToString()).ToString(), out int result))
{
if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish)
isNormal = false;
}
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(TaskStatus.ToString()).ToString(), out result))
{
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
isNormal = false;
@@ -108,7 +109,7 @@
IsNormal = isNormal,
TaskNum = taskNum,
TaskId = task.TaskId,
- TaskState = taskState,
+ TaskState = TaskStatus,
Description = description,
CurrentAddress = task.CurrentAddress,
NextAddress = task.NextAddress,
@@ -187,7 +188,7 @@
{
throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
}
- active = steps.IndexOf(task.TaskState) + 1;
+ active = steps.IndexOf(task.TaskStatus) + 1;
}
--
Gitblit v1.9.3