From e46aa927d231af83724683c7286d9db503e24cf7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 10 六月 2025 11:46:20 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 120 ------------------------------------------------------------
1 files changed, 0 insertions(+), 120 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 9d23f8a..0120d8e 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"
@@ -22,7 +22,6 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
-using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
@@ -45,34 +44,6 @@
{
try
{
- bool isNormal = true;
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
- 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 = taskId,
- TaskState = taskState,
- Description = description,
- CurrentAddress = task.CurrentAddress,
- NextAddress = task.NextAddress,
- };
- BaseDal.AddData(taskExecuteDetail);
}
catch (Exception ex)
{
@@ -87,34 +58,6 @@
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))
- {
- 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);
@@ -130,69 +73,6 @@
WebResponseContent content = new();
try
{
- int active = -1;
- List<object> list = new();
- List<int> steps = new();
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
- if (task != null)
- {
-
- if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
- {
- steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList();
-
- foreach (var item in steps)
- {
- object obj;
- FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
- DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- if (descriptionAttribute != null)
- {
- obj = new { title = item, description = descriptionAttribute.Description };
- }
- else
- {
- obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() };
- }
- list.Add(obj);
- }
- }
- else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
- steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InFinish).ToList();
- foreach (var item in steps)
- {
- object obj;
- FieldInfo? fieldInfo = typeof(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString());
- DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- if (descriptionAttribute != null)
- {
- obj = new { title = item, description = descriptionAttribute.Description };
- }
- else
- {
- obj = new { title = item, description = ((TaskInStatusEnum)item).ToString() };
- }
- list.Add(obj);
- }
- }
- else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
- //todo 璋冪敤WMS绉诲簱瀹屾垚
- }
- else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
- {
-
- }
- else
- {
- throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
- }
- active = steps.IndexOf(task.TaskState) + 1;
-
- }
-
- content = WebResponseContent.Instance.OK(data: new { active, list });
}
catch (Exception ex)
{
--
Gitblit v1.9.3