From 74a4dbfebd891573e916cdb3e4ce7b0c7edf0a8e Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 02 十二月 2025 17:42:00 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs"
index 40ddaa2..e11a30b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs"
@@ -107,8 +107,12 @@
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
}
-
- if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ {
+ _taskService.UpdateTaskStatusToNext(task.TaskNum);
+ }
+
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.RelocationGroup)
{
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -121,14 +125,8 @@
}
else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
{
- commonConveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(9990));
commonConveyorLine.SetValue(ConveyorLineDBName.PutFinish, 1, "LK001");
- Thread.Sleep(1000);
- commonConveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(9990));
- commonConveyorLine.Communicator.WriteNoRead("DB100.4", Convert.ToInt16(task.TaskNum));
- task.TaskState = (int)TaskInStatusEnum.AGV_InFinish;
- _taskRepository.UpdateData(task);
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
}
@@ -150,7 +148,6 @@
WebResponseContent content = new WebResponseContent();
try
{
-
if (task.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarry)
{
if (task.Floor == "1F")
@@ -161,10 +158,10 @@
{
elevator.SetValue(ElevatorDBName.TwoLayerPickUpFinish, 1);
}
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
- }
-
+ _taskService.UpdateTaskStatusToNext(task.TaskNum);
+ content.OK();
+ }
if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
{
commonConveyorLine.SetValue(ConveyorLineDBName.PickUpFinish, 1, "LK001");
@@ -226,8 +223,6 @@
if (commonConveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.AllowPickUp, "LK001") == 1)
{
_taskService.ContinueAgvTask(task.AGVTaskNum);
- //task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
- //_taskRepository.UpdateData(task);
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
}
--
Gitblit v1.9.3