From 8bd46da0c9fbfe39a65d75b1d85692d8783f5905 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 15 九月 2021 10:50:54 +0800
Subject: [PATCH] 现场修改
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index c49221c..7d5994c 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -19,6 +19,8 @@
{
public Timer ResetTimer = null;
+ MachineState MeasureState = MachineState.Unknown;
+
object machineStateLock = new object();
//MachineState _machineStatePre = MachineState.Unknown;
MachineState machineState = MachineState.Unknown;
@@ -250,6 +252,8 @@
(invokeDevice as MotionCardBase).ResetAlarm();
_isdoing = false;
+ _pausedHandle.Set();
+
RaisedAlarm("");
OnCheckHintUpload?.Invoke("", false);
@@ -681,7 +685,15 @@
}
_pausedHandle.Set();
RaisedAlarm("");
- MachineState = _machineStateBeforePause;
+
+ if (_machineStateBeforePause == MachineState.Running && MeasureState == MachineState.Ready)
+ {
+ MachineState = MachineState.Ready;
+ }
+ else
+ {
+ MachineState = _machineStateBeforePause;
+ }
}
}
}
--
Gitblit v1.8.0