lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、增加二维码长度的限制，如果长度不够，当扫码失败处理

Browse Source 
2、修复从INPUT搬运到EMPTY1的bug
develop
lhiven 1 year ago
parent b361c77f75
commit 7bb09d71b2
12 changed files with 258 additions and 85 deletions
Show Stats Download Patch File Download Diff File

11
Rs.SkyLine/Commom/GlobalVar.cs
Unescape Escape View File

@ -2089,5 +2089,16 @@ namespace Rs.Framework
return SysConfigParam.GetValue<bool>(nameof(EnablePlaceToFixtureOpenVac));
}
}
/// <summary>
/// 二维码长度
/// </summary>
[ParameterInit("int", "18", "system", "二维码长度")]
public static int QrcodeLength
{
get;
set;
}
}
}

6
Rs.SkyLine/Commom/Scheduling.cs
Unescape Escape View File

@ -715,7 +715,11 @@ namespace Rs.MotionPlat.Commom
/// <summary>
/// 治具光纤检査开关
/// </summary>
FixtureOpticalSensorCheck
FixtureOpticalSensorCheck,
/// <summary>
/// 条码长度 <see cref="int"/>
/// </summary>
BarcodeLength,
}
}

11
Rs.SkyLine/Flow/Camera/VisionManager.cs
Unescape Escape View File

@ -299,8 +299,15 @@ namespace Rs.MotionPlat.Flow.Camera
HOperatorSet.FindDataCode2d(imageMulti, out xlds, dataCodeHandle, new HTuple(), new HTuple(), out resultHandles, out decodedDataStrings);
if (decodedDataStrings.Length > 0)
{
HOperatorSet.ClearDataCode2dModel(dataCodeHandle);
return decodedDataStrings.ToString().Replace("\"", "");
if (GlobalVar.QrcodeLength == 0 || decodedDataStrings.ToString().Replace("\"", "").Length == GlobalVar.QrcodeLength)
{
HOperatorSet.ClearDataCode2dModel(dataCodeHandle);
return decodedDataStrings.ToString().Replace("\"", "");
}
else
{
HOperatorSet.ClearDataCode2dModel(dataCodeHandle);
}
}
else
{

50
Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -2231,31 +2231,31 @@ namespace Rs.MotionPlat.Flow
}
logInfo = GetClassName() + $"任务结束已回到安全位";
MessageQueue.Instance.Insert(logInfo);
TraySlot slot = GlobalTray.InputTray.GetSlot(ESlotStatus.Have);
if (slot == null)
{
if (Ops.IsOn("2号料仓缺盘光电检测"))
{
logInfo = GetClassName() + $"{curTask.FromType.ToString()}盘无料,准备切换料盘";
MessageQueue.Instance.Insert(logInfo);
TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1,
() =>
{
Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.Whole, null);
});
}, null,
() =>
{
Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null);
});
});
StockManager.Instance.GetStock(ETrayType.Input).WaitFinished();
}
}
//TraySlot slot = GlobalTray.InputTray.GetSlot(ESlotStatus.Have);
//if (slot == null)
//{
// if (Ops.IsOn("2号料仓缺盘光电检测"))
// {
// logInfo = GetClassName() + $"{curTask.FromType.ToString()}盘无料,准备切换料盘";
// MessageQueue.Instance.Insert(logInfo);
// TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1,
// () =>
// {
// Task.Run(() =>
// {
// StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.Whole, null);
// });
// }, null,
// () =>
// {
// Task.Run(() =>
// {
// StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null);
// });
// });
// StockManager.Instance.GetStock(ETrayType.Input).WaitFinished();
// }
//}
flowStep = EDischargeFlowStep.等待任务;
//else
//{

4
Rs.SkyLine/Flow/TestCenter.cs
Unescape Escape View File

@ -54,6 +54,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug($"测试软件 >>> FixtureOpticalSensorCheck:{ssi.Info}");
GlobalVar.EnableTestFixtureFiberCheck = bool.Parse(ssi.Info);
break;
case SchedulingStatusInfo.InfoType.BarcodeLength:
LogHelper.Debug($"二维码长度设置 >>> BarcodeLength: {ssi.Info}");
GlobalVar.QrcodeLength = int.Parse(ssi.Info);
break;
case SchedulingStatusInfo.InfoType.State:
break;
case SchedulingStatusInfo.InfoType.RunStatus:

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.43")]
[assembly: AssemblyVersion("3.20.24.44")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

25
Rs.SkyLine/SysConfig/CommonConfig.Designer.cs generated
Unescape Escape View File

@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CommonConfig));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@ -64,6 +65,7 @@
this.cboxEnableIndexTimeStatistics = new System.Windows.Forms.CheckBox();
this.cboxRunSpace = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.txtQrcodeLength = new System.Windows.Forms.TextBox();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.txtUpCameraExposureTime = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
@ -80,6 +82,7 @@
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.cboxUpCameraName = new System.Windows.Forms.ComboBox();
this.label19 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnImageSavePath = new System.Windows.Forms.Button();
this.txtImageSaveDays = new System.Windows.Forms.TextBox();
@ -126,6 +129,7 @@
this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox();
this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tableLayoutPanel1.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox2.SuspendLayout();
@ -413,17 +417,25 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.txtQrcodeLength);
this.groupBox3.Controls.Add(this.groupBox10);
this.groupBox3.Controls.Add(this.groupBox9);
this.groupBox3.Controls.Add(this.cboxDownLocationCameraName);
this.groupBox3.Controls.Add(this.label8);
this.groupBox3.Controls.Add(this.label7);
this.groupBox3.Controls.Add(this.cboxUpCameraName);
this.groupBox3.Controls.Add(this.label19);
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.ForeColor = System.Drawing.Color.White;
this.groupBox3.Name = "groupBox3";
this.groupBox3.TabStop = false;
//
// txtQrcodeLength
//
resources.ApplyResources(this.txtQrcodeLength, "txtQrcodeLength");
this.txtQrcodeLength.Name = "txtQrcodeLength";
this.txtQrcodeLength.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// groupBox10
//
this.groupBox10.Controls.Add(this.txtUpCameraExposureTime);
@ -540,6 +552,11 @@
resources.ApplyResources(this.cboxUpCameraName, "cboxUpCameraName");
this.cboxUpCameraName.Name = "cboxUpCameraName";
//
// label19
//
resources.ApplyResources(this.label19, "label19");
this.label19.Name = "label19";
//
// groupBox1
//
this.groupBox1.Controls.Add(this.btnImageSavePath);
@ -895,6 +912,11 @@
this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera";
this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
//
// CommonConfig
//
resources.ApplyResources(this, "$this");
@ -1029,5 +1051,8 @@
private System.Windows.Forms.CheckBox cboxEnableRefreshImageUI;
private System.Windows.Forms.TextBox txtClosedQifuValue;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.TextBox txtQrcodeLength;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
}
}

5
Rs.SkyLine/SysConfig/CommonConfig.cs
Unescape Escape View File

@ -79,6 +79,11 @@ namespace Rs.MotionPlat.SysConfig
ComboBox cbox = (ComboBox)con;
cbox.SelectedItem = SysConfigParam.GetValue<string>(cbox.Name.Replace("cbox", ""));
}
else if (con is TextBox)
{
TextBox txt = (TextBox)con;
txt.Text = SysConfigParam.GetValue<string>(txt.Name.Replace("txt", ""));
}
}
foreach (var con in groupBox2.Controls)

102
Rs.SkyLine/SysConfig/CommonConfig.en-US.resx
Unescape Escape View File

@ -118,6 +118,36 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="groupBox8.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 3</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>845, 432</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Device paramter</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>844, 433</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Camera parameter setting</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>844, 432</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Speed</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 441</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>845, 433</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1701, 877</value>
</data>
<data name="button1.Location" type="System.Drawing.Point, System.Drawing">
<value>251, 388</value>
</data>
@ -133,6 +163,12 @@
<data name="label2.Text" xml:space="preserve">
<value>Language:</value>
</data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>519, 322</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Pop-up language</value>
</data>
<data name="cboxMsgShowKo.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 16</value>
</data>
@ -151,12 +187,6 @@
<data name="cboxMsgShowCn.Text" xml:space="preserve">
<value>CN</value>
</data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>519, 322</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Pop-up language</value>
</data>
<data name="txtQifuValue.Location" type="System.Drawing.Point, System.Drawing">
<value>372, 31</value>
</data>
@ -292,14 +322,11 @@
<data name="cboxRunSpace.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 206</value>
</data>
<data name="groupBox8.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 3</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>845, 432</value>
<data name="groupBox10.Size" type="System.Drawing.Size, System.Drawing">
<value>305, 146</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Device paramter</value>
<data name="groupBox10.Text" xml:space="preserve">
<value>Upper camera</value>
</data>
<data name="txtUpCameraExposureTime.Location" type="System.Drawing.Point, System.Drawing">
<value>131, 20</value>
@ -316,11 +343,14 @@
<data name="txtUpCameraGain.Location" type="System.Drawing.Point, System.Drawing">
<value>131, 47</value>
</data>
<data name="groupBox10.Size" type="System.Drawing.Size, System.Drawing">
<value>305, 146</value>
<data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 115</value>
</data>
<data name="groupBox10.Text" xml:space="preserve">
<value>Upper camera</value>
<data name="groupBox9.Size" type="System.Drawing.Size, System.Drawing">
<value>308, 146</value>
</data>
<data name="groupBox9.Text" xml:space="preserve">
<value>Lower camera</value>
</data>
<data name="txtFlyGrabExposureTime.Location" type="System.Drawing.Point, System.Drawing">
<value>159, 20</value>
@ -355,15 +385,6 @@
<data name="txtFlyGrabGain.Location" type="System.Drawing.Point, System.Drawing">
<value>159, 47</value>
</data>
<data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>396, 115</value>
</data>
<data name="groupBox9.Size" type="System.Drawing.Size, System.Drawing">
<value>308, 146</value>
</data>
<data name="groupBox9.Text" xml:space="preserve">
<value>Lower camera</value>
</data>
<data name="cboxDownLocationCameraName.Location" type="System.Drawing.Point, System.Drawing">
<value>132, 67</value>
</data>
@ -382,11 +403,11 @@
<data name="cboxUpCameraName.Location" type="System.Drawing.Point, System.Drawing">
<value>132, 30</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>844, 433</value>
<data name="label19.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 12</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Camera parameter setting</value>
<data name="label19.Text" xml:space="preserve">
<value>Qrcode length:</value>
</data>
<data name="btnImageSavePath.Location" type="System.Drawing.Point, System.Drawing">
<value>470, 243</value>
@ -400,15 +421,15 @@
<data name="txtImageSavePath.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 246</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>838, 66</value>
</data>
<data name="btnSaveSpeedParam.Location" type="System.Drawing.Point, System.Drawing">
<value>638, 6</value>
</data>
<data name="btnSaveSpeedParam.Text" xml:space="preserve">
<value>Save</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>838, 66</value>
</data>
<data name="tbarTakeTraySpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 100</value>
</data>
@ -511,24 +532,9 @@
<data name="label1.Text" xml:space="preserve">
<value>Overall speed :</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>844, 432</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Speed</value>
</data>
<data name="dataGridView1.Size" type="System.Drawing.Size, System.Drawing">
<value>839, 413</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 441</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>845, 433</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1701, 877</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1701, 877</value>
</data>

85
Rs.SkyLine/SysConfig/CommonConfig.resx
Unescape Escape View File

@ -1098,6 +1098,30 @@
<data name="&gt;&gt;groupBox8.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtQrcodeLength.Location" type="System.Drawing.Point, System.Drawing">
<value>601, 29</value>
</data>
<data name="txtQrcodeLength.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 21</value>
</data>
<data name="txtQrcodeLength.TabIndex" type="System.Int32, mscorlib">
<value>44</value>
</data>
<data name="txtQrcodeLength.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;txtQrcodeLength.Name" xml:space="preserve">
<value>txtQrcodeLength</value>
</data>
<data name="&gt;&gt;txtQrcodeLength.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtQrcodeLength.Parent" xml:space="preserve">
<value>groupBox3</value>
</data>
<data name="&gt;&gt;txtQrcodeLength.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtUpCameraExposureTime.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 9pt</value>
</data>
@ -1240,7 +1264,7 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;groupBox10.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="txtFlyGrabExposureTime.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 9pt</value>
@ -1444,7 +1468,7 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;groupBox9.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="cboxDownLocationCameraName.Location" type="System.Drawing.Point, System.Drawing">
<value>105, 67</value>
@ -1465,7 +1489,7 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;cboxDownLocationCameraName.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1495,7 +1519,7 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1525,7 +1549,7 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cboxUpCameraName.Location" type="System.Drawing.Point, System.Drawing">
<value>105, 30</value>
@ -1546,7 +1570,40 @@
<value>groupBox3</value>
</data>
<data name="&gt;&gt;cboxUpCameraName.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="label19.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label19.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label19.Location" type="System.Drawing.Point, System.Drawing">
<value>514, 32</value>
</data>
<data name="label19.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 12</value>
</data>
<data name="label19.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label19.Text" xml:space="preserve">
<value>二维码长度:</value>
</data>
<data name="label19.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;label19.Name" xml:space="preserve">
<value>label19</value>
</data>
<data name="&gt;&gt;label19.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label19.Parent" xml:space="preserve">
<value>groupBox3</value>
</data>
<data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="groupBox3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -2794,7 +2851,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="groupBox8" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="groupBox3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="groupBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="groupBox4" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Percent,50,Percent,50,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
@ -2802,6 +2859,18 @@
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>197, 17</value>
</metadata>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 4</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
<value>contextMenuStrip1</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -2854,6 +2923,6 @@
<value>CommonConfig</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.41, Culture=neutral, PublicKeyToken=null</value>
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.44, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

13
Rs.SkyLine/TestFrm.Designer.cs generated
Unescape Escape View File

@ -65,6 +65,7 @@
this.button28 = new System.Windows.Forms.Button();
this.button30 = new System.Windows.Forms.Button();
this.button31 = new System.Windows.Forms.Button();
this.button32 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// btnTurnoverSlotException
@ -438,11 +439,22 @@
this.button31.UseVisualStyleBackColor = true;
this.button31.Click += new System.EventHandler(this.button31_Click);
//
// button32
//
this.button32.Location = new System.Drawing.Point(540, 732);
this.button32.Name = "button32";
this.button32.Size = new System.Drawing.Size(75, 23);
this.button32.TabIndex = 10;
this.button32.Text = "button32";
this.button32.UseVisualStyleBackColor = true;
this.button32.Click += new System.EventHandler(this.button32_Click);
//
// TestFrm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1336, 854);
this.Controls.Add(this.button32);
this.Controls.Add(this.button31);
this.Controls.Add(this.button30);
this.Controls.Add(this.button28);
@ -525,5 +537,6 @@
private System.Windows.Forms.Button button28;
private System.Windows.Forms.Button button30;
private System.Windows.Forms.Button button31;
private System.Windows.Forms.Button button32;
}
}

29
Rs.SkyLine/TestFrm.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using Rs.Framework;
using Rs.Motion;
using Rs.MotionPlat.Commom;
using Rs.MotionPlat.Entitys;
using Rs.MotionPlat.Entitys.Trays;
using Rs.MotionPlat.Flow;
using Rs.MotionPlat.Flow.Camera;
using Rs.MotionPlat.Flow.NgFlow;
@ -461,5 +462,33 @@ namespace Rs.MotionPlat
{
TrayShake.ShakeAsync(ETrayType.Input);
}
private void button32_Click(object sender, EventArgs e)
{
TurnoverTrayManager.Instance.Slot(1).SN = "1";
TurnoverTrayManager.Instance.Slot(2).SN = "2";
TurnoverTrayManager.Instance.Slot(3).SN = "1";
TurnoverTrayManager.Instance.Slot(4).SN = "3";
TurnoverTrayManager.Instance.Slot(5).SN = "4";
TurnoverTrayManager.Instance.Slot(6).SN = "5";
TurnoverTrayManager.Instance.Slot(7).SN = "6";
TurnoverTrayManager.Instance.Slot(8).SN = "7";
List<TurnoverTraySlot> slotList= new List<TurnoverTraySlot>();
slotList.Add(TurnoverTrayManager.Instance.Slot(1));
slotList.Add(TurnoverTrayManager.Instance.Slot(2));
slotList.Add(TurnoverTrayManager.Instance.Slot(3));
slotList.Add(TurnoverTrayManager.Instance.Slot(4));
slotList.Add(TurnoverTrayManager.Instance.Slot(5));
slotList.Add(TurnoverTrayManager.Instance.Slot(6));
slotList.Add(TurnoverTrayManager.Instance.Slot(7));
slotList.Add(TurnoverTrayManager.Instance.Slot(8));
var gb = slotList.GroupBy(s => s.SN).Where(aa=>aa.Count()>=2).ToList();
}
}
}

Write Preview
Loading…
Cancel
Save