From 3f6e94d7de9694378114773ab48d8a61bcc3a01e Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 01 二月 2021 09:22:20 +0800
Subject: [PATCH] 1. 报警生成前后端异步调用 2. 安全光栅方法单线程调用 3. 复位完成时修改界面显示 4. 机台状态拆分执行状态
---
src/Bro.M071.Process/M071Process.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 7165338..7666577 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -48,6 +48,7 @@
public event Action<IShapeElement> OnElementUpdated;
public event Action<MachineState> OnMachineStateChanged;
public event Action OnFullResetDone;
+ public event Action OnResetDone;
#endregion
string _precision = "f3";
@@ -197,6 +198,8 @@
object productionLock = new object();
List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();
+ bool _isdoing = false;
+
[ProcessMethod("", "StartJob", "寮�濮嬫壂鎻�", InvokeType.TestInvoke)]
[MethodImpl(MethodImplOptions.Synchronized)]
public ProcessResponse StartJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
@@ -207,6 +210,7 @@
}
string hint = "";
+
//if (MachineState != MachineState.Ready)
//{
// hint = "鏈哄彴鏈氨缁紝璇峰嬁寮�濮嬫祴閲�";
@@ -221,6 +225,8 @@
OnCheckHintUpload?.Invoke(hint, true);
throw new ProcessException(hint);
}
+
+ _isdoing = true;
MachineState = MachineState.Running;
@@ -317,6 +323,7 @@
});
LogAsync(DateTime.Now, $"{pMeasure.Barcode}娴嬮噺鍔ㄤ綔瀹屾垚", "");
+ _isdoing = false;
GC.Collect(0, GCCollectionMode.Optimized);
@@ -330,8 +337,11 @@
get => isLeftStart;
set
{
- isLeftStart = value;
- StartCheck();
+ if (IsLeftStart != value)
+ {
+ isLeftStart = value;
+ StartCheck();
+ }
}
}
@@ -341,8 +351,11 @@
get => isRightStart;
set
{
- isRightStart = value;
- StartCheck();
+ if (isRightStart != value)
+ {
+ isRightStart = value;
+ StartCheck();
+ }
}
}
@@ -350,6 +363,11 @@
{
if (isRightStart && isLeftStart)
{
+ if (_isdoing)
+ {
+ OnCheckHintUpload?.Invoke("璁惧杩愯涓�", false);
+ return;
+ }
StartJob(null, null, null);
}
}
--
Gitblit v1.8.0