From 5ab61d58dfd7a8da568cd638326fa360e93c5f64 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 14 三月 2026 16:55:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TestJob.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 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..1debf07 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"
@@ -68,22 +68,25 @@
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)
{
//濡傛灉璐ㄦ閫氳繃浜嗭紝灏辨妸浠诲姟鐘舵�佹敼涓鸿川妫�瀹屾垚
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);
}
}
else
--
Gitblit v1.9.3