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

搬运料盘结束后，异步加载料盘上料流程改为同步加载

Browse Source
develop
lhiven 1 year ago
parent de11e8a9f8
commit 91d633fdfc
5 changed files with 1897 additions and 1802 deletions
Show Stats Download Patch File Download Diff File

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

@ -2063,5 +2063,30 @@ namespace Rs.Framework
return SysConfigParam.GetValue<bool>(nameof(EnableRefreshImageUI));
}
}
/// <summary>
/// 关闭气浮
/// </summary>
[ParameterInit("double", "0.01", "system", "关闭气浮")]
public static double ClosedQifuValue
{
get
{
return SysConfigParam.GetValue<double>(nameof(ClosedQifuValue));
}
}
/// <summary>
/// 治具放料是否打开真空吸
/// </summary>
[ParameterInit("bool", "True", "system", "治具放料是否打开真空吸")]
public static bool EnablePlaceToFixtureOpenVac
{
get
{
return SysConfigParam.GetValue<bool>(nameof(EnablePlaceToFixtureOpenVac));
}
}
}
}

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

@ -1185,12 +1185,12 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() => {
//Task.Run(() => {
StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.AfterTakeTray, () => {
GlobalTray.GetTray(ETrayType.Input).ChangeStatus(ESlotStatus.NotHave);
});
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Input).WaitFinished();
}
@ -1239,11 +1239,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Ok).WaitFinished();
}
@ -1261,11 +1261,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Ok).WaitFinished();
}
@ -1314,11 +1314,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Ng).WaitFinished();
}
@ -1336,11 +1336,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Ng).WaitFinished();
}
@ -1385,11 +1385,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Multi).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Multi).WaitFinished();
}
@ -1407,11 +1407,11 @@ namespace Rs.MotionPlat.Flow
null,
() =>
{
Task.Run(() =>
{
//Task.Run(() =>
//{
StockManager.Instance.GetStock(ETrayType.Multi).Load(EStockTrayLoadMode.AfterTakeTray, null);
});
Thread.Sleep(1000);
//});
//Thread.Sleep(1000);
});
StockManager.Instance.GetStock(ETrayType.Multi).WaitFinished();
}

6
Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs
Unescape Escape View File

@ -812,7 +812,8 @@ namespace Rs.AutoDischarge.V3.Flow
{
logInfo = GetClassName() + $"{GetTrayName()}料仓下料完成已运动到起始位";
MessageQueue.Instance.Insert(logInfo);
finished = true;
isRunning = false;
ChangeStatus(EStockTrayStatus.Unloaded);
//unloadStep = EStockTrayUnloadFlowStep.等待命令;
StockZ.Home();
@ -828,8 +829,7 @@ namespace Rs.AutoDischarge.V3.Flow
{
isFull = false;
}
finished = true;
isRunning = false;
StockFlow.Zero(0);
//actionFinishedEvent.Set();
}

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

@ -124,6 +124,8 @@
this.cboxEnableExceptionHandlingNozzle = new System.Windows.Forms.CheckBox();
this.cboxEnableScanBarCodeByDownCamera = new System.Windows.Forms.CheckBox();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.label18 = new System.Windows.Forms.Label();
this.txtClosedQifuValue = new System.Windows.Forms.TextBox();
this.tableLayoutPanel1.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox2.SuspendLayout();
@ -154,12 +156,13 @@
//
// groupBox8
//
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.Controls.Add(this.button1);
this.groupBox8.Controls.Add(this.cboxLanguage);
this.groupBox8.Controls.Add(this.label2);
this.groupBox8.Controls.Add(this.groupBox2);
this.groupBox8.Controls.Add(this.txtClosedQifuValue);
this.groupBox8.Controls.Add(this.txtQifuValue);
this.groupBox8.Controls.Add(this.label18);
this.groupBox8.Controls.Add(this.txtDischargeRetakeNum);
this.groupBox8.Controls.Add(this.label9);
this.groupBox8.Controls.Add(this.cboxScanBarcodeFailAutoSkip);
@ -181,15 +184,16 @@
this.groupBox8.Controls.Add(this.cboxEnableTestFixtureFiberCheck);
this.groupBox8.Controls.Add(this.cboxEnableIndexTimeStatistics);
this.groupBox8.Controls.Add(this.cboxRunSpace);
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.ForeColor = System.Drawing.Color.White;
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.button1.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.button1, "button1");
this.button1.ForeColor = System.Drawing.Color.White;
this.button1.Name = "button1";
this.button1.UseVisualStyleBackColor = false;
@ -197,11 +201,11 @@
//
// cboxLanguage
//
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.FormattingEnabled = true;
this.cboxLanguage.Items.AddRange(new object[] {
resources.GetString("cboxLanguage.Items"),
resources.GetString("cboxLanguage.Items1")});
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.Name = "cboxLanguage";
//
// label2
@ -240,18 +244,18 @@
//
// txtQifuValue
//
resources.ApplyResources(this.txtQifuValue, "txtQifuValue");
this.txtQifuValue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtQifuValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtQifuValue.ForeColor = System.Drawing.Color.White;
resources.ApplyResources(this.txtQifuValue, "txtQifuValue");
this.txtQifuValue.Name = "txtQifuValue";
this.txtQifuValue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtQifuValue_KeyUp);
//
// txtDischargeRetakeNum
//
resources.ApplyResources(this.txtDischargeRetakeNum, "txtDischargeRetakeNum");
this.txtDischargeRetakeNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtDischargeRetakeNum.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtDischargeRetakeNum, "txtDischargeRetakeNum");
this.txtDischargeRetakeNum.ForeColor = System.Drawing.Color.White;
this.txtDischargeRetakeNum.Name = "txtDischargeRetakeNum";
this.txtDischargeRetakeNum.Tag = "";
@ -395,33 +399,33 @@
//
// groupBox3
//
resources.ApplyResources(this.groupBox3, "groupBox3");
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);
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.ForeColor = System.Drawing.Color.White;
this.groupBox3.Name = "groupBox3";
this.groupBox3.TabStop = false;
//
// groupBox10
//
resources.ApplyResources(this.groupBox10, "groupBox10");
this.groupBox10.Controls.Add(this.txtUpCameraExposureTime);
this.groupBox10.Controls.Add(this.label21);
this.groupBox10.Controls.Add(this.label24);
this.groupBox10.Controls.Add(this.txtUpCameraGain);
this.groupBox10.ForeColor = System.Drawing.Color.White;
resources.ApplyResources(this.groupBox10, "groupBox10");
this.groupBox10.Name = "groupBox10";
this.groupBox10.TabStop = false;
//
// txtUpCameraExposureTime
//
resources.ApplyResources(this.txtUpCameraExposureTime, "txtUpCameraExposureTime");
this.txtUpCameraExposureTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtUpCameraExposureTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtUpCameraExposureTime, "txtUpCameraExposureTime");
this.txtUpCameraExposureTime.ForeColor = System.Drawing.Color.White;
this.txtUpCameraExposureTime.Name = "txtUpCameraExposureTime";
this.txtUpCameraExposureTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
@ -438,16 +442,15 @@
//
// txtUpCameraGain
//
resources.ApplyResources(this.txtUpCameraGain, "txtUpCameraGain");
this.txtUpCameraGain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtUpCameraGain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtUpCameraGain, "txtUpCameraGain");
this.txtUpCameraGain.ForeColor = System.Drawing.Color.White;
this.txtUpCameraGain.Name = "txtUpCameraGain";
this.txtUpCameraGain.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// groupBox9
//
resources.ApplyResources(this.groupBox9, "groupBox9");
this.groupBox9.Controls.Add(this.txtFlyGrabExposureTime);
this.groupBox9.Controls.Add(this.txtDownCameraFlyRegrabNum);
this.groupBox9.Controls.Add(this.label12);
@ -455,23 +458,24 @@
this.groupBox9.Controls.Add(this.label13);
this.groupBox9.Controls.Add(this.txtFlyGrabGain);
this.groupBox9.ForeColor = System.Drawing.Color.White;
resources.ApplyResources(this.groupBox9, "groupBox9");
this.groupBox9.Name = "groupBox9";
this.groupBox9.TabStop = false;
//
// txtFlyGrabExposureTime
//
resources.ApplyResources(this.txtFlyGrabExposureTime, "txtFlyGrabExposureTime");
this.txtFlyGrabExposureTime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtFlyGrabExposureTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtFlyGrabExposureTime, "txtFlyGrabExposureTime");
this.txtFlyGrabExposureTime.ForeColor = System.Drawing.Color.White;
this.txtFlyGrabExposureTime.Name = "txtFlyGrabExposureTime";
this.txtFlyGrabExposureTime.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// txtDownCameraFlyRegrabNum
//
resources.ApplyResources(this.txtDownCameraFlyRegrabNum, "txtDownCameraFlyRegrabNum");
this.txtDownCameraFlyRegrabNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtDownCameraFlyRegrabNum.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtDownCameraFlyRegrabNum, "txtDownCameraFlyRegrabNum");
this.txtDownCameraFlyRegrabNum.ForeColor = System.Drawing.Color.White;
this.txtDownCameraFlyRegrabNum.Name = "txtDownCameraFlyRegrabNum";
this.txtDownCameraFlyRegrabNum.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
@ -493,17 +497,17 @@
//
// txtFlyGrabGain
//
resources.ApplyResources(this.txtFlyGrabGain, "txtFlyGrabGain");
this.txtFlyGrabGain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtFlyGrabGain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtFlyGrabGain, "txtFlyGrabGain");
this.txtFlyGrabGain.ForeColor = System.Drawing.Color.White;
this.txtFlyGrabGain.Name = "txtFlyGrabGain";
this.txtFlyGrabGain.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// cboxDownLocationCameraName
//
resources.ApplyResources(this.cboxDownLocationCameraName, "cboxDownLocationCameraName");
this.cboxDownLocationCameraName.FormattingEnabled = true;
resources.ApplyResources(this.cboxDownLocationCameraName, "cboxDownLocationCameraName");
this.cboxDownLocationCameraName.Name = "cboxDownLocationCameraName";
//
// label8
@ -518,13 +522,12 @@
//
// cboxUpCameraName
//
resources.ApplyResources(this.cboxUpCameraName, "cboxUpCameraName");
this.cboxUpCameraName.FormattingEnabled = true;
resources.ApplyResources(this.cboxUpCameraName, "cboxUpCameraName");
this.cboxUpCameraName.Name = "cboxUpCameraName";
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.btnImageSavePath);
this.groupBox1.Controls.Add(this.txtImageSaveDays);
this.groupBox1.Controls.Add(this.txtImageSavePath);
@ -551,15 +554,16 @@
this.groupBox1.Controls.Add(this.label16);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label1);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.ForeColor = System.Drawing.Color.White;
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// btnImageSavePath
//
resources.ApplyResources(this.btnImageSavePath, "btnImageSavePath");
this.btnImageSavePath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.btnImageSavePath.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.btnImageSavePath, "btnImageSavePath");
this.btnImageSavePath.ForeColor = System.Drawing.Color.White;
this.btnImageSavePath.Name = "btnImageSavePath";
this.btnImageSavePath.UseVisualStyleBackColor = false;
@ -578,8 +582,8 @@
//
// panelEx1
//
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Controls.Add(this.btnSaveSpeedParam);
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Name = "panelEx1";
//
// btnSaveSpeedParam
@ -594,10 +598,10 @@
//
// cboxCurRecipe
//
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.FormattingEnabled = true;
this.cboxCurRecipe.Items.AddRange(new object[] {
resources.GetString("cboxCurRecipe.Items")});
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.Name = "cboxCurRecipe";
//
// label4
@ -743,7 +747,6 @@
//
// groupBox4
//
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.Controls.Add(this.dataGridView1);
this.groupBox4.Controls.Add(this.label6);
this.groupBox4.Controls.Add(this.panel1);
@ -753,13 +756,13 @@
this.groupBox4.Controls.Add(this.txtControlCenterPort);
this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle);
this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera);
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.ForeColor = System.Drawing.Color.White;
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
// dataGridView1
//
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@ -769,6 +772,7 @@
this.英文名,
this.是否显示,
this.是否需要登录});
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.Name = "dataGridView1";
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black;
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1;
@ -818,9 +822,9 @@
//
// panel1
//
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Controls.Add(this.radioButton4);
this.panel1.Controls.Add(this.radioButton3);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// radioButton4
@ -841,9 +845,9 @@
//
// txtControlCenterIP
//
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterIP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.ForeColor = System.Drawing.Color.White;
this.txtControlCenterIP.Name = "txtControlCenterIP";
//
@ -859,9 +863,9 @@
//
// txtControlCenterPort
//
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.ForeColor = System.Drawing.Color.White;
this.txtControlCenterPort.Name = "txtControlCenterPort";
//
@ -877,9 +881,19 @@
this.cboxEnableScanBarCodeByDownCamera.Name = "cboxEnableScanBarCodeByDownCamera";
this.cboxEnableScanBarCodeByDownCamera.UseVisualStyleBackColor = true;
//
// folderBrowserDialog1
// label18
//
resources.ApplyResources(this.label18, "label18");
this.label18.Name = "label18";
//
// txtClosedQifuValue
//
resources.ApplyResources(this.folderBrowserDialog1, "folderBrowserDialog1");
this.txtClosedQifuValue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtClosedQifuValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtClosedQifuValue.ForeColor = System.Drawing.Color.White;
resources.ApplyResources(this.txtClosedQifuValue, "txtClosedQifuValue");
this.txtClosedQifuValue.Name = "txtClosedQifuValue";
this.txtClosedQifuValue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtQifuValue_KeyUp);
//
// CommonConfig
//
@ -1013,5 +1027,7 @@
private System.Windows.Forms.Label label10;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.CheckBox cboxEnableRefreshImageUI;
private System.Windows.Forms.TextBox txtClosedQifuValue;
private System.Windows.Forms.Label label18;
}
}

3546
Rs.SkyLine/SysConfig/CommonConfig.resx
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save