From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
index ab46551..0d40e08 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
@@ -71,8 +71,9 @@
elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
_taskService.SendAgvTask("AAA", AcrossFloorTask.TaskNum);
- AcrossFloorTask.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarry;
- _taskRepository.UpdateData(AcrossFloorTask);
+ //AcrossFloorTask.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarry;
+ //_taskRepository.UpdateData(AcrossFloorTask);
+ _taskService.UpdateTaskStatusToNext(AcrossFloorTask.TaskNum);
}
else
{
@@ -83,8 +84,9 @@
elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
_taskService.SendAgvTask("DDD", AcrossFloorTask.TaskNum);
- AcrossFloorTask.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarry;
- _taskRepository.UpdateData(AcrossFloorTask);
+ //AcrossFloorTask.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarry;
+ //_taskRepository.UpdateData(AcrossFloorTask);
+ _taskService.UpdateTaskStatusToNext(AcrossFloorTask.TaskNum);
}
}
}
@@ -108,29 +110,33 @@
var InTask = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InNew);
if (InTask != null)
{
- var OutTask = _taskRepository.QueryFirst(x => x.TaskState >= (int)TaskOutStatusEnum.OutNew && x.TaskState <(int)TaskOutStatusEnum.AGV_OutExecuting);
- var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InExecuting);
- if (OutTask == null && task == null)
+ CommonConveyorLine? conveyorLine = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1001") as CommonConveyorLine;
+ var OutTask = _taskRepository.QueryFirst(x => x.TaskState >= (int)TaskOutStatusEnum.OutNew && x.TaskState < (int)TaskOutStatusEnum.AGV_OutExecuting);
+ var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InFinish);
+ if (OutTask == null)
{
- CommonConveyorLine? conveyorLine = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1001") as CommonConveyorLine;
if (conveyorLine != null)
{
- bool IsWrite = false;
short InteractiveSignal = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, "LK001");
var structs = BitConverter.GetBytes(InteractiveSignal).Reverse().ToArray().ToBoolArray();
- if (structs[0])
+ if ((task != null && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting && !structs[1]) || task == null)
{
- IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(0));
- Thread.Sleep(1000);
- IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(9999));
- if (!IsWrite)
- {
- return Task.CompletedTask;
- }
- Relocation(InTask);
- _taskService.SendAgvTask("LIFANG", InTask.TaskNum);
+ bool IsWrite = false;
- _taskService.UpdateTaskStatusToNext(InTask.TaskNum);
+ if (structs[0] && !structs[1])
+ {
+ IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(0));
+ Thread.Sleep(1000);
+ IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", Convert.ToInt32(9999));
+ if (!IsWrite)
+ {
+ return Task.CompletedTask;
+ }
+ Relocation(InTask);
+ _taskService.SendAgvTask("LIFANG", InTask.TaskNum);
+
+ _taskService.UpdateTaskStatusToNext(InTask.TaskNum);
+ }
}
}
}
--
Gitblit v1.9.3