From 6428fad15dbe79e30a48ffc9aabe31e03a45426c Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期四, 05 十二月 2019 12:50:13 +0800
Subject: [PATCH] 1. 添加部分log信息 2. 修改部分机器人动作流程 3. 开放OperationConfig的InputData参数
---
src/A032.Process/AGVPath.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/A032.Process/AGVPath.cs b/src/A032.Process/AGVPath.cs
index 1bfb3e0..2e19e32 100644
--- a/src/A032.Process/AGVPath.cs
+++ b/src/A032.Process/AGVPath.cs
@@ -25,6 +25,8 @@
LoadFullTray = 3,
[Description("鍗歌浇婊ray鍦扮偣")]
UnloadFullTray = 4,
+ [Description("鍏呯數鍦扮偣")]
+ Charge = 5,
}
public class PathPosition : IComplexDisplay
@@ -73,7 +75,7 @@
[Description("璇ヤ綅缃爣鍑嗙偣浣嶄俊鎭�")]
[TypeConverter(typeof(ComplexObjectConvert))]
[Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
- public CustomizedPoint StandardPoint { get; set; } = new CustomizedPoint();
+ public CustomizedPointWithAngle StandardPoint { get; set; } = new CustomizedPointWithAngle();
[Category("瑙嗚閰嶇疆")]
[Description("璇ヤ綅缃媿鎽勯厤缃�")]
@@ -102,7 +104,23 @@
config.PositionCollection.ForEach(p =>
{
- _hash[p.PositionCode] = $"{p.PositionCode}-{p.Description.GetEnumDescription()}";
+ _hash[p.PositionCode] = $"{p.PositionCode}-{p.PositionNo}-{p.Description.GetEnumDescription()}";
+ });
+ }
+ }
+ }
+
+ public class PositionNoConverter : ComboBoxItemTypeConvert
+ {
+ public override void GetConvertHash()
+ {
+ using (var scope = GlobalVar.Container.BeginLifetimeScope())
+ {
+ var config = scope.Resolve<ProcessConfig>();
+
+ config.PositionCollection.ForEach(p =>
+ {
+ _hash[p.PositionNo] = $"{p.PositionNo}-{p.PositionCode}-{p.Description.GetEnumDescription()}";
});
}
}
--
Gitblit v1.8.0