From 875a4c2ad21ec2b7c937955773e9687f1c43bb64 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 17:36:39 +0800
Subject: [PATCH] 板卡暂停/恢复提至板卡基类 流程方法修改参数
---
src/Bro.M071.Process/M071Models.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index bd98beb..5ccaad2 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -178,7 +178,22 @@
public string GetDisplayText()
{
- return $"{AliasName}";
+ string snapShot = "鏈寚瀹�";
+
+ using (var scope = GlobalVar.Container.BeginLifetimeScope())
+ {
+ var config = scope.Resolve<IProcessConfig>();
+ if (config != null)
+ {
+ var snapshotPoint = (config as M071Config).SnapshotPointCollection.FirstOrDefault(u => u.Id == SnapshotPointId);
+ if (snapshotPoint != null)
+ {
+ snapShot = snapshotPoint.Name;
+ }
+ }
+ }
+
+ return $"{AliasName}-{snapShot}-{ImageSeq}";
}
public List<string> GetHalconToolPathList()
@@ -204,6 +219,7 @@
public class ProductionMeasurement : INotifyPropertyChanged, IDisposable
{
public string Barcode;
+ public string PResult;
public List<MeasurementUnit> Measurements = new List<MeasurementUnit>();
--
Gitblit v1.8.0