From 4d2b6fea8d08c95bd6bb2b8c2b1228383110457e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 12:48:46 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 86e82b2..b9bf715 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)
{
@@ -66,33 +67,74 @@
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);
if (qualityResult)
{
//濡傛灉璐ㄦ閫氳繃浜嗭紝灏辨妸浠诲姟鐘舵�佹敼涓鸿川妫�瀹屾垚
task.TaskState = TaskStatusEnum.CheckShapeingOk.ObjToInt();
+ task.ExceptionMessage = "";
Uptasks.Add(task);
}
else
{
task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
- task.ExceptionMessage = "璐ㄦ澶辫触";
+ task.ExceptionMessage = "澶栨澶辫触";
if (R_LeftOverWidthWarning) task.ExceptionMessage += ",宸﹁秴瀹�";
if (R_RightWideWarning) task.ExceptionMessage += ",鍙宠秴瀹�";
if (R_ExtremeWarning) task.ExceptionMessage += ",瓒呴珮";
Uptasks.Add(task);
//鍐欏叆澶嶄綅淇″彿
- device.SetValue(QualityInspectionCommandEnum.FaultReset, true, task.SourceAddress);
+ //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
+ //{
+ // //鍐欏叆鍋滄璐ㄦ淇″彿
+ // 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);
+ task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
+ task.ExceptionMessage = "鏈娴嬪埌璐ㄦ瀹屾垚淇″彿";
+ Uptasks.Add(task);
}
}
+ foreach (var item in AGVtaskList)
+ {
+
+ if (device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.SourceAddress))
+ {
+ item.ExceptionMessage = $"{item.SourceAddress}绔欏彴鏈夎揣,鏃犳硶杩涘叆";
+ continue;
+ }
+ //into杩涘叆涓�妤间綅缃殑鏃跺�欙紝鍐欏叆杩涘叆淇″彿
+ device.SetValue(QualityInspectionCommandEnum.RequestToEnter, true, item.SourceAddress);
+ if (!device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.Blocking)==true)
+ {
+ item.ExceptionMessage = $"{item.TargetAddress}绔欏彴鍏夋爡涓嶄负true锛�1锛�!";
+ }
+ 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