From c54e0666bdd34fbe133fe521bf9d46dd6c0fe53e Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 12 六月 2025 10:33:28 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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..945eb64 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"
@@ -61,6 +61,11 @@
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
isNormal = false;
}
+ else if (!int.TryParse(Enum.Parse<AGVTaskStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(AGVTaskStatusEnum)result > (int)AGVTaskStatusEnum.AGVFinish)
+ isNormal = false;
+ }
Dt_TaskExecuteDetail taskExecuteDetail = new()
{
IsManual = App.User.UserId > 0,
@@ -101,6 +106,11 @@
else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
{
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
+ isNormal = false;
+ }
+ else if (!int.TryParse(Enum.Parse<AGVTaskStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(AGVTaskStatusEnum)result > (int)AGVTaskStatusEnum.AGVFinish)
isNormal = false;
}
Dt_TaskExecuteDetail taskExecuteDetail = new()
@@ -176,6 +186,25 @@
list.Add(obj);
}
}
+ else if (!int.TryParse(Enum.Parse<AGVTaskTypeEnum>(task.TaskType.ToString()).ToString(), out result))
+ {
+ steps = Enum.GetValues(typeof(AGVTaskStatusEnum)).Cast<int>().Where(x => x <= (int)AGVTaskStatusEnum.AGVFinish).ToList();
+ foreach (var item in steps)
+ {
+ object obj;
+ FieldInfo? fieldInfo = typeof(AGVTaskStatusEnum).GetField(((AGVTaskStatusEnum)item).ToString());
+ DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (descriptionAttribute != null)
+ {
+ obj = new { title = item, description = descriptionAttribute.Description };
+ }
+ else
+ {
+ obj = new { title = item, description = ((AGVTaskStatusEnum)item).ToString() };
+ }
+ list.Add(obj);
+ }
+ }
else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
//todo 璋冪敤WMS绉诲簱瀹屾垚
--
Gitblit v1.9.3