From 01030b05f7ea9b14878102718a2004b4f908dcfc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 28 五月 2025 11:15:12 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 20 +++++++++++---------
1 files changed, 11 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..06eed97 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,9 +22,11 @@
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;
+using WIDESEAWCS_DTO.TaskEnum;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -48,14 +50,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 +68,7 @@
IsNormal = isNormal,
TaskNum = taskNum,
TaskId = taskId,
- TaskState = taskState,
+ TaskState = TaskStatus,
Description = description,
CurrentAddress = task.CurrentAddress,
NextAddress = task.NextAddress,
@@ -90,14 +92,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 +110,7 @@
IsNormal = isNormal,
TaskNum = taskNum,
TaskId = task.TaskId,
- TaskState = taskState,
+ TaskState = TaskStatus,
Description = description,
CurrentAddress = task.CurrentAddress,
NextAddress = task.NextAddress,
@@ -187,7 +189,7 @@
{
throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
}
- active = steps.IndexOf(task.TaskState) + 1;
+ active = steps.IndexOf(task.TaskStatus) + 1;
}
--
Gitblit v1.9.3