From a4122d504f8fc5f0626eaa0cbc270b47742812d9 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期一, 26 八月 2024 17:13:36 +0800 Subject: [PATCH] 1 --- WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 68 +++++++++++++++++----------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs b/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs index 9c94b0b..8b82065 100644 --- a/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs +++ b/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs @@ -83,44 +83,44 @@ { try { - Task.Run(() => + //Task.Run(() => + //{ + //Thread.Sleep(500); + List<Dt_TaskExecuteDetail> taskExecuteDetails = new List<Dt_TaskExecuteDetail>(); + foreach (var item in taskNums) { - //Thread.Sleep(500); - List<Dt_TaskExecuteDetail> taskExecuteDetails = new List<Dt_TaskExecuteDetail>(); - foreach (var item in taskNums) + bool isNormal = true; + Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == item); + if (task == null) return; + int taskNum = task.TaskNum; + int taskState = task.TaskState; + + if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result)) { - bool isNormal = true; - Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == item); - if (task == null) return; - int taskNum = task.TaskNum; - int taskState = task.TaskState; - - if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.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)) - { - if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish) - isNormal = false; - } - Dt_TaskExecuteDetail taskExecuteDetail = new() - { - IsManual = App.User.UserId > 0, - IsNormal = isNormal, - TaskNum = taskNum, - TaskId = task.TaskId, - TaskState = taskState, - Description = description, - CurrentAddress = task.CurrentAddress, - NextAddress = task.NextAddress, - }; - taskExecuteDetails.Add(taskExecuteDetail); + if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish) + isNormal = false; } + else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result)) + { + if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish) + isNormal = false; + } + Dt_TaskExecuteDetail taskExecuteDetail = new() + { + IsManual = App.User.UserId > 0, + IsNormal = isNormal, + TaskNum = taskNum, + TaskId = task.TaskId, + TaskState = taskState, + Description = description, + CurrentAddress = task.CurrentAddress, + NextAddress = task.NextAddress, + }; + taskExecuteDetails.Add(taskExecuteDetail); + } - BaseDal.AddData(taskExecuteDetails); - }); + BaseDal.AddData(taskExecuteDetails); + //}); } catch (Exception ex) { -- Gitblit v1.9.3