From 0aac30d1c6f1ca0c2bf7662fb9ca4f0d98b3bca7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期一, 09 六月 2025 14:29:25 +0800
Subject: [PATCH] Merge branch 'qy0427' of http://115.159.85.185:8098/r/MeiXinLaiRui/ShenSuoGanKongZhi into qy0427
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
index b7393c0..1d08638 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
@@ -64,7 +64,6 @@
var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80");
Console.WriteLine($"{devices.Value.left.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck1}锛屽叾浠栨姤璀leftPLcOher1}");
if (leftPLcstuck1 == true && leftPLcOher1 == false)
- //if (leftPLcOher == false)
{
string text = $"杞ㄩ亾{deid}锛氫几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
@@ -102,7 +101,7 @@
{
//鍙硃lc
var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); //鍗′綇鎶ヨ
- var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M110");//鍏朵粬鎶ヨ
+ var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111");//鍏朵粬鎶ヨ
var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80");
Console.WriteLine($"{devices.Value.right.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
if (rightPLcSuck == true && rightPLcOher == false)
--
Gitblit v1.9.3