Skip to content

张东亮 / SO1057-XLRStore

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

手动忽略料叉检查

1 个父辈 42ef5301
内嵌 并排
正在显示 6 个修改的文件 包含 130 行增加 和 53 行删除
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.Designer.cs
......@@ -61,7 +61,10 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.设置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.a料口重置料串ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.b料口重置料串ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.二维码学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.托盘初始化ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -69,8 +72,6 @@
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.解锁舱门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.a料口重置料串ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.b料口重置料串ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.清空日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
......@@ -93,7 +94,8 @@
this.lbldiancifa = new System.Windows.Forms.Label();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.忽略当次料叉检查ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
......@@ -366,60 +368,62 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(221, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(221, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(221, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(221, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
// 设置TToolStripMenuItem
//
this.设置TToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.忽略当次料叉检查ToolStripMenuItem,
this.toolStripSeparator13,
this.a料口重置料串ToolStripMenuItem,
this.toolStripSeparator6,
this.b料口重置料串ToolStripMenuItem,
......@@ -435,68 +439,73 @@
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31);
this.设置TToolStripMenuItem.Text = "设备调试 ";
//
// a料口重置料串ToolStripMenuItem
//
this.a料口重置料串ToolStripMenuItem.Name = "a料口重置料串ToolStripMenuItem";
this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.a料口重置料串ToolStripMenuItem.Text = "A料口重置料串";
this.a料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.a料口重置料串ToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(229, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(255, 6);
this.toolStripSeparator6.Visible = false;
//
// b料口重置料串ToolStripMenuItem
//
this.b料口重置料串ToolStripMenuItem.Name = "b料口重置料串ToolStripMenuItem";
this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.b料口重置料串ToolStripMenuItem.Text = "B料口重置料串";
this.b料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.b料口重置料串ToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(255, 6);
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(232, 32);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(229, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(255, 6);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(232, 32);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(229, 6);
this.toolStripSeparator16.Size = new System.Drawing.Size(255, 6);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(232, 32);
this.toolStripMenuItem3.Size = new System.Drawing.Size(258, 32);
this.toolStripMenuItem3.Text = "脆盘料号配置";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(229, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(255, 6);
//
// 解锁舱门ToolStripMenuItem
//
this.解锁舱门ToolStripMenuItem.Name = "解锁舱门ToolStripMenuItem";
this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(232, 32);
this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.解锁舱门ToolStripMenuItem.Text = "解锁舱门";
this.解锁舱门ToolStripMenuItem.Click += new System.EventHandler(this.解锁舱门ToolStripMenuItem_Click);
//
// a料口重置料串ToolStripMenuItem
//
this.a料口重置料串ToolStripMenuItem.Name = "a料口重置料串ToolStripMenuItem";
this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(232, 32);
this.a料口重置料串ToolStripMenuItem.Text = "A料口重置料串";
this.a料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.a料口重置料串ToolStripMenuItem_Click);
//
// b料口重置料串ToolStripMenuItem
//
this.b料口重置料串ToolStripMenuItem.Name = "b料口重置料串ToolStripMenuItem";
this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(232, 32);
this.b料口重置料串ToolStripMenuItem.Text = "B料口重置料串";
this.b料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.b料口重置料串ToolStripMenuItem_Click);
//
// 帮助ToolStripMenuItem
//
this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -692,10 +701,17 @@
this.lblStatus.Size = new System.Drawing.Size(69, 20);
this.lblStatus.Text = "等待启动";
//
// toolStripSeparator12
// 忽略当次料叉检查ToolStripMenuItem
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(229, 6);
this.忽略当次料叉检查ToolStripMenuItem.Name = "忽略当次料叉检查ToolStripMenuItem";
this.忽略当次料叉检查ToolStripMenuItem.Size = new System.Drawing.Size(258, 32);
this.忽略当次料叉检查ToolStripMenuItem.Text = "忽略当次料叉检查";
this.忽略当次料叉检查ToolStripMenuItem.Click += new System.EventHandler(this.忽略当次料叉检查ToolStripMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(255, 6);
//
// FrmXLRStore
//
......@@ -799,6 +815,8 @@
private System.Windows.Forms.ToolStripMenuItem a料口重置料串ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem b料口重置料串ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripMenuItem 忽略当次料叉检查ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
}
}
source/XLRStoreClient/FrmXLRStore.cs
......@@ -793,9 +793,16 @@ namespace OnlineStore.XLRStore
private void 解锁舱门ToolStripMenuItem_Click(object sender, EventArgs e)
{
LogUtil.info("用户点击打开舱门");
FrmReleaseDoor frmReleaseDoor = new FrmReleaseDoor();
frmReleaseDoor.ShowDialog();
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!