From 75d16a23d059439c7478f8d3f6372c29072ba84e Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期三, 06 五月 2026 16:27:14 +0800
Subject: [PATCH] 完善任务执行步骤
---
项目代码/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 110 ++++++------------------------------------------------
1 files changed, 13 insertions(+), 97 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index c6d4fb6..5bc5834 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -50,17 +50,12 @@
bool isNormal = true;
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
if (task == null) return;
- int taskNum = task.TaskNum;
+ int taskNum = task.TaskId;
int taskState = task.TaskState;
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
+ if (!int.TryParse(Enum.Parse<TaskAGVCarryStatusEnum>(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)
+ if ((int)(TaskAGVCarryStatusEnum)result > (int)TaskAGVCarryStatusEnum.AGV_COMPLETED)
isNormal = false;
}
@@ -93,14 +88,9 @@
int NewtaskNum = task.TaskNum;
int taskState = task.TaskState;
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
+ if (!int.TryParse(Enum.Parse<TaskAGVCarryStatusEnum>(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)
+ if ((int)(TaskAGVCarryStatusEnum)result > (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
isNormal = false;
}
@@ -124,52 +114,6 @@
}
}
- public void AddTaskExecuteDetail(List<int> taskNums, string description = "")
- {
- try
- {
- 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);
- }
- catch (Exception ex)
- {
-
- }
- }
-
public WebResponseContent GetDetailInfo(int taskNum)
{
WebResponseContent content = new();
@@ -178,18 +122,18 @@
int active = -1;
List<object> list = new();
List<int> steps = new();
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskNum);
if (task != null)
{
- if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
+ if (!int.TryParse(Enum.Parse<TaskAGVCarryTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
{
- steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList();
+ steps = Enum.GetValues(typeof(TaskAGVCarryStatusEnum)).Cast<int>().Where(x => x <= (int)TaskAGVCarryStatusEnum.AGV_COMPLETED).ToList();
foreach (var item in steps)
{
object obj;
- FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(TaskAGVCarryStatusEnum).GetField(((TaskAGVCarryStatusEnum)item).ToString());
DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (descriptionAttribute != null)
{
@@ -197,38 +141,10 @@
}
else
{
- obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() };
+ obj = new { title = item, description = ((TaskAGVCarryStatusEnum)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
{
@@ -254,8 +170,8 @@
WebResponseContent content = new();
try
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
- Dt_Task_Hty task_Hty = _task_htyRepository.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskNum);
+ Dt_Task_Hty task_Hty = _task_htyRepository.QueryFirst(x => x.TaskId == taskNum);
if (task != null)
{
List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskId == task.TaskId, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
@@ -264,7 +180,7 @@
}
else if (task_Hty != null)
{
- List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskNum == taskNum, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
+ List<Dt_TaskExecuteDetail> taskExecuteDetails = BaseDal.QueryData(x => x.TaskId == task_Hty.TaskNum, new Dictionary<string, SqlSugar.OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), SqlSugar.OrderByType.Asc } });
content = WebResponseContent.Instance.OK(data: taskExecuteDetails);
}
--
Gitblit v1.9.3