From f9e8a2d52fe52fb2389892a46c12d4d262ee9aaf Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 29 十一月 2025 16:53:28 +0800
Subject: [PATCH] 增加提升机可进行一次进俩托物料出入库

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs |   49 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 43 insertions(+), 6 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 97a8222..bedaecb 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,13 +91,31 @@
 
                 if (task.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarry)
                 {
-                    if (task.Floor == "1F")
+                    if (task.DoubleTray != 1)
                     {
-                        elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
+                        if (task.Floor == "1F")
+                        {
+                            elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
+                        }
+                        else
+                        {
+                            elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
+                        }
                     }
                     else
                     {
-                        elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
+                        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);
+                            }
+                        }
                     }
                     _taskService.UpdateTaskStatusToNext(task.TaskNum);
                     content.OK();
@@ -151,15 +169,34 @@
 
                 if (task.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarry)
                 {
-                    if (task.Floor == "1F")
+                    if (task.DoubleTray != 1)
                     {
-                        elevator.SetValue(ElevatorDBName.OneLayerPickUpFinish, 1);
+                        if (task.Floor == "1F")
+                        {
+                            elevator.SetValue(ElevatorDBName.OneLayerPickUpFinish, 1);
+                        }
+                        else
+                        {
+                            elevator.SetValue(ElevatorDBName.TwoLayerPickUpFinish, 1);
+                        }
                     }
                     else
                     {
-                        elevator.SetValue(ElevatorDBName.TwoLayerPickUpFinish, 1);
+                        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);
+                            }
+                        }
                     }
                     _taskService.UpdateTaskStatusToNext(task.TaskNum);
+                    content.OK();
                 }
                 
 

--
Gitblit v1.9.3