From 7e69830653c9be2d675c3fb4c5578ac1efa4b89c Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 08:58:33 +0800
Subject: [PATCH] 添加跨楼层的接口以及优化

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
index 9b4d943..f2339f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs"
@@ -67,10 +67,6 @@
                             var R_RightWideWarning = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_RightWideWarning, task.SourceAddress);
                             //瓒呴珮璀﹀憡
                             var R_ExtremeWarning = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_ExtremeWarning, task.SourceAddress);
-                            //鍐欏叆鍋滄璐ㄦ淇″彿
-                            device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, true, task.SourceAddress);
-                            Thread.Sleep(500);
-                            device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
                             if (qualityResult)
                             {
                                 //濡傛灉璐ㄦ閫氳繃浜嗭紝灏辨妸浠诲姟鐘舵�佹敼涓鸿川妫�瀹屾垚
@@ -89,6 +85,10 @@
                                 //鍐欏叆澶嶄綅淇″彿
                                 //device.SetValue(QualityInspectionCommandEnum.FaultReset, true, task.SourceAddress);
                             }
+                            //鍐欏叆鍋滄璐ㄦ淇″彿
+                            device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, true, task.SourceAddress);
+                            Thread.Sleep(500);
+                            device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
                         }
                         //else
                         //{
@@ -96,12 +96,18 @@
                         //    device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
                         //    device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
                         //}
+                        else
+                        {
+                            task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
+                            task.ExceptionMessage = "鏈娴嬪埌璐ㄦ瀹屾垚淇″彿";
+                            Uptasks.Add(task);
+                        }
                     }
                     foreach (var item in AGVtaskList)
                     {
 
                         //into杩涘叆涓�妤间綅缃殑鏃跺�欙紝鍐欏叆杩涘叆淇″彿
-                        device.SetValue(QualityInspectionCommandEnum.RequestToEnter, true, item.TargetAddress);
+                        device.SetValue(QualityInspectionCommandEnum.RequestToEnter, true, item.SourceAddress);
                         if (!device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.Blocking)==true)
                         {
                             item.ExceptionMessage = $"{item.TargetAddress}绔欏彴鍏夋爡涓嶄负true锛�1锛�!";

--
Gitblit v1.9.3