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 | 54 ++++++++----------------------------------------------
1 files changed, 8 insertions(+), 46 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 bedaecb..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"
@@ -91,31 +91,13 @@
if (task.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarry)
{
- if (task.DoubleTray != 1)
+ if (task.Floor == "1F")
{
- if (task.Floor == "1F")
- {
- elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
- }
+ elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
}
else
{
- var taskDouble = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarryFinish && x.DoubleTray==1);
- if (taskDouble != null)
- {
- if (task.Floor == "1F")
- {
- elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
- }
- }
+ elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
}
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
@@ -125,7 +107,7 @@
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
}
- else if(task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
{
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -166,40 +148,20 @@
WebResponseContent content = new WebResponseContent();
try
{
-
if (task.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarry)
{
- if (task.DoubleTray != 1)
+ if (task.Floor == "1F")
{
- if (task.Floor == "1F")
- {
- elevator.SetValue(ElevatorDBName.OneLayerPickUpFinish, 1);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TwoLayerPickUpFinish, 1);
- }
+ elevator.SetValue(ElevatorDBName.OneLayerPickUpFinish, 1);
}
else
{
- var taskDouble = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarry && x.DoubleTray == 1 && x.PalletCode != task.PalletCode);
- if (taskDouble == null)
- {
- if (task.Floor == "1F")
- {
- elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
- }
- }
+ elevator.SetValue(ElevatorDBName.TwoLayerPickUpFinish, 1);
}
+
_taskService.UpdateTaskStatusToNext(task.TaskNum);
content.OK();
}
-
-
if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
{
commonConveyorLine.SetValue(ConveyorLineDBName.PickUpFinish, 1, "LK001");
--
Gitblit v1.9.3