From 0128fce75a5e7cc9afc4bd89ce1966eb2231b69f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 31 三月 2026 10:55:33 +0800
Subject: [PATCH] 编写海康跨楼层接口

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 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 1debf07..fdf3f1f 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"
@@ -52,6 +52,7 @@
                 {
                     List<Dt_Task> Uptasks = new List<Dt_Task>();
                     var taskList = _taskService.Repository.QueryData(x => x.TaskType == TaskTypeEnum.CPInbound.ObjToInt() && x.TaskState == TaskStatusEnum.CheckShapeing.ObjToInt());
+                    var AGVtaskList = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt()&& (x.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || x.TaskType == TaskTypeEnum.Q3CK.ObjToInt()));//1-6鍜�6-1妤间换鍔�
                     //浠诲姟鐨勭洰鏍囧湴鍧�瀵逛簬绔欏彴鍙凤紱
                     foreach (var task in taskList)
                     {
@@ -89,12 +90,30 @@
                                 //device.SetValue(QualityInspectionCommandEnum.FaultReset, true, task.SourceAddress);
                             }
                         }
-                        else
-                        {
-                            //鍐欏叆鍋滄璐ㄦ淇″彿
-                            device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
-                            device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
-                        }
+                        //else
+                        //{
+                        //    //鍐欏叆鍋滄璐ㄦ淇″彿
+                        //    device.SetValue(QualityInspectionCommandEnum.StopqualityInspection, false, task.SourceAddress);
+                        //    device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+                        //}
+                    }
+                    foreach (var item in AGVtaskList)
+                    {
+                        
+                            var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum);
+                            if (result.Status == false)
+                            {
+                                if (item.ExceptionMessage != result.Message)
+                                {
+                                item.ExceptionMessage = result.Message;
+                                    Uptasks.Add(item);
+                                }
+                                continue;
+                            }
+                            item.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+                            item.ExceptionMessage = "";
+                            Uptasks.Add(item);
+                        
                     }
                     _taskService.UpdateData(Uptasks);
                     WriteInfo(device.DeviceName, "infoLog");

--
Gitblit v1.9.3