From 88676143aeceaeec3bd108f9cd609c4f3470ba96 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 30 七月 2025 15:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
index 5ae5962..e82882e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
@@ -129,7 +129,7 @@
ForceCancel="1",
MatterArea= task.CurrentAddress,
TaskCode=task.AgvTaskNum,
- ReqCode = DateTime.Now.ToString("yyyyMMddHHmmss") + task.AgvTaskNum,
+ ReqCode = DateTime.Now.ToString("yyMMddHHmmss") + task.AgvTaskNum,
ReqTime= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
};
WebResponseContent content = _taskService.AgvBoxApplyPass(agvCTUCancel);
@@ -177,8 +177,7 @@
switch (agvUpdateModel.Method.ToUpper())
{
case "END":
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.OutEmpty.ObjToInt()
- || task.TaskType == TaskTypeEnum.OutAllocate.ObjToInt() || task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ if (task.TaskType.GetTaskTypeGroup()==TaskTypeGroup.OutbondGroup)
PutFinish(task.NextAddress);
_taskService.TaskCompleted(task.TaskNum);
break;
@@ -356,7 +355,7 @@
TakeFinish(task.CurrentAddress);
//_taskService.UpdateTask(task, TaskStatusEnum.AGV_Executing);
}
- else if(task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ else if(task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
_taskRepository.UpdateData(task);
--
Gitblit v1.9.3