Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fb65b0c9 由 张东亮
选项

手动忽略料叉检查

1 个父辈 42ef5301
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 72 行增加 和 13 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
......@@ -265,11 +265,17 @@ namespace OnlineStore.DeviceLibrary
case StepEnum.SI_04_InOutToBuff:
MoveInfo.NextMoveStep(StepEnum.SI_05_GetReel);
LogInfo($"入库 {MoveInfo.SLog}：取料盘，移栽升降轴到上暂存区入库取料高点P2/P8，移栽压紧轴到压紧点P3");
AddReelCheck(true);
//AddReelCheck(true);
UpdownAxisTo_P2_P8();
ComAxis_To_P3();
break;
case StepEnum.SI_05_GetReel:
if (!CheckReel(true))
{
WarnMsg = "未检测到料叉上的料盘，请检查";
return;
}
ignoreCurFork = false;
MoveInfo.NextMoveStep(StepEnum.SI_06_InOutBackToP1FromBuff);
LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到待机点P1，行走机构到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
XAxis_To_P1();
......@@ -427,7 +433,7 @@ namespace OnlineStore.DeviceLibrary
break;
case StepEnum.SI_18_PutTrayDown:
MoveInfo.NextMoveStep(StepEnum.SI_19_InoutBack);
AddReelCheck(false);
//AddReelCheck(false);
LogInfo($"入库 {MoveInfo.SLog}：抽屉拉取进出轴到拍照点,检测料叉信号,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (CheckASide())
{
......@@ -456,6 +462,12 @@ namespace OnlineStore.DeviceLibrary
}
break;
case StepEnum.SI_19_InoutBack:
if (!CheckReel(false))
{
WarnMsg = "检测到料叉上有料盘，请检查";
return;
}
ignoreCurFork = false;
if (!CheckInStoreOtherSideInfo())
{
//if (InDoorSigCheck())
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
......@@ -158,7 +158,7 @@ namespace OnlineStore.DeviceLibrary
break;
case StepEnum.SO_12_PutTrayDown:
MoveInfo.NextMoveStep(StepEnum.SO_13_InoutBack);
AddReelCheck(true);
//AddReelCheck(true);
LogInfo($"出库 {MoveInfo.SLog}：抽屉拉取进出轴到拍照点,检测料叉信号，同时检测{trayAColumns[GetPosColumn()]}=1 [{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (CheckASide())
{
......@@ -221,6 +221,12 @@ namespace OnlineStore.DeviceLibrary
// }
//}
//直接出库，执行该步骤的情况：1.另一个料叉有料；2.另一面有出库任务但出料口有料；3.另一面没有出库任务;
if(!CheckReel(true))
{
WarnMsg = "未检测到料叉上的料盘，请检查";
return;
}
ignoreCurFork = false;
MoveInfo.NextMoveStep(StepEnum.SO_14_GetReels_Ready);
MoveAxisToP1();
PullAxis_UpdownToP1();
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
......@@ -547,6 +547,10 @@ namespace OnlineStore.DeviceLibrary
{
get { return ConfigHelper.Config.Get("IgnoreForkSig", false); }
}
/// <summary>
/// 忽略当前料叉状态
/// </summary>
public bool ignoreCurFork = false;
bool ignoreHook
{
get { return ConfigHelper.Config.Get("IgnoreHookSig", true); }
......@@ -568,6 +572,30 @@ namespace OnlineStore.DeviceLibrary
}
}
/// <summary>
/// 检查料叉上的状态
/// </summary>
/// <param name="hasReel"></param>
/// <returns></returns>
bool CheckReel(bool hasReel)
{
if (ignoreFork)
{
return true;//暂时屏蔽
}
if (ignoreCurFork)
{
return true;
}
if (CheckASide())
{
return IOValue(IO_Type.ForkA_Tray_Check).Equals(hasReel ? IO_VALUE.HIGH : IO_VALUE.LOW);
}
else
{
return IOValue(IO_Type.ForkB_Tray_Check).Equals(hasReel ? IO_VALUE.HIGH : IO_VALUE.LOW);
}
}
/// <summary>
/// 抽屉水平点，料斗拉取升降轴到料屉水平点P2
/// </summary>
private void PullAxis_UpdownToMiddleP2(bool isdebugSpeed = false)
......
source/XLRStoreClient/FrmXLRStore.cs
......@@ -793,10 +793,17 @@ namespace OnlineStore.XLRStore
private void 解锁舱门ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (StoreManager.XLRStore.boxEquip.runStatus.Equals(RunStatus.Wait))
{
LogUtil.info("用户点击打开舱门");
FrmReleaseDoor frmReleaseDoor = new FrmReleaseDoor();
frmReleaseDoor.ShowDialog();
}
else
{
MessageBox.Show("请先停止设备后再打开舱门！");
}
}
private void a料口重置料串ToolStripMenuItem_Click(object sender, EventArgs e)
{
......@@ -811,5 +818,11 @@ namespace OnlineStore.XLRStore
StoreManager.XLRStore.inputEquip.BatchMove_B.Reset(true);
LogUtil.info(StoreManager.XLRStore.inputEquip.BatchMove_B.Name + "点击：重置料串");
}
private void 忽略当次料叉检查ToolStripMenuItem_Click(object sender, EventArgs e)
{
StoreManager.XLRStore.boxEquip.ignoreCurFork = true;
LogUtil.info(StoreManager.XLRStore.boxEquip.Name + "点击：忽略当次料叉检查");
}
}
}
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
......@@ -220,7 +220,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(210, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(200, 509);
this.groupBox4.Size = new System.Drawing.Size(200, 505);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -238,7 +238,7 @@
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(189, 489);
this.tableLayoutPanel2.Size = new System.Drawing.Size(189, 485);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -248,7 +248,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(200, 509);
this.groupBox3.Size = new System.Drawing.Size(200, 505);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -266,7 +266,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(189, 489);
this.tableLayoutPanel1.Size = new System.Drawing.Size(189, 485);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupDO
......@@ -286,7 +286,7 @@
//
// ucHumitempure4
//
this.ucHumitempure4.Location = new System.Drawing.Point(241, 203);
this.ucHumitempure4.Location = new System.Drawing.Point(241, 186);
this.ucHumitempure4.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.ucHumitempure4.Name = "ucHumitempure4";
this.ucHumitempure4.Size = new System.Drawing.Size(194, 153);
......@@ -294,7 +294,7 @@
//
// ucHumitempure3
//
this.ucHumitempure3.Location = new System.Drawing.Point(12, 203);
this.ucHumitempure3.Location = new System.Drawing.Point(12, 186);
this.ucHumitempure3.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.ucHumitempure3.Name = "ucHumitempure3";
this.ucHumitempure3.Size = new System.Drawing.Size(194, 153);
......@@ -337,10 +337,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(5, 56);
this.tabControl1.Location = new System.Drawing.Point(5, 60);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(993, 551);
this.tabControl1.Size = new System.Drawing.Size(993, 547);
this.tabControl1.TabIndex = 257;
//
// tabPage3
......@@ -348,7 +348,7 @@
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(985, 518);
this.tabPage3.Size = new System.Drawing.Size(985, 468);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 设备状态 ";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -410,7 +410,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(985, 518);
this.tabPage1.Size = new System.Drawing.Size(985, 514);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!