Skip to content

张东亮 / SO1057-XLRStore

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

抓取料盘失败处理

1 个父辈 adda3978
内嵌 并排
正在显示 5 个修改的文件 包含 66 行增加 和 33 行删除
source/DeviceLibrary/manager/model/DeviceStep.cs
...@@ -888,7 +888,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -888,7 +888,7 @@ namespace OnlineStore.DeviceLibrary
/// 入库料串取料：等待测高完成 /// 入库料串取料：等待测高完成
/// </summary> /// </summary>
II11_WaitHeight, II11_WaitHeight,
II12_Handle,
/// <summary> /// <summary>
/// 入库料串取料：测宽度，记录条码高度宽度，开始下一盘预扫码 /// 入库料串取料：测宽度，记录条码高度宽度，开始下一盘预扫码
/// </summary> /// </summary>
......
source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs
...@@ -253,6 +253,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -253,6 +253,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.II11_WaitHeight)) else if (MoveInfo.IsStep(StepEnum.II11_WaitHeight))
{ {
SetWarnMsg("");
BatchMoveBean moveBean = BatchMove_A; BatchMoveBean moveBean = BatchMove_A;
if (shelf.Equals(2)) if (shelf.Equals(2))
{ {
...@@ -318,6 +319,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -318,6 +319,17 @@ namespace OnlineStore.DeviceLibrary
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 信号检测尺寸和AOI不符"); MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 信号检测尺寸和AOI不符");
} }
} }
MoveInfo.NextMoveStep(StepEnum.II12_Handle);
MoveLog($"入库{MoveInfo.SLog}: 取完料,进出轴回待机点P1 {Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsTimeOut(60))
{
SetWarnMsg(Name + " " + moveBean.Name + "获取料盘高度超时");
}
}
else if (MoveInfo.IsStep(StepEnum.II12_Handle))
{
if (MoveInfo.MoveParam.PosInfo.IsNG) if (MoveInfo.MoveParam.PosInfo.IsNG)
{ {
StrartToTargetP(); StrartToTargetP();
...@@ -325,11 +337,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -325,11 +337,6 @@ namespace OnlineStore.DeviceLibrary
else else
II13_GetPosId(); II13_GetPosId();
} }
else if (MoveInfo.IsTimeOut(60))
{
SetWarnMsg(Name + " " + moveBean.Name + "获取料盘高度超时");
}
}
else if (MoveInfo.IsStep(StepEnum.II13_GetPosId)) else if (MoveInfo.IsStep(StepEnum.II13_GetPosId))
{ {
if (getPosTask != null && getPosTask.IsCompleted && LastPosInfo != null) if (getPosTask != null && getPosTask.IsCompleted && LastPosInfo != null)
...@@ -856,7 +863,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -856,7 +863,8 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck_A, IO_VALUE.LOW)); SetWarnMsg("料盘拿走失败，A料口定位料盘检测信号亮");
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck_A, IO_VALUE.LOW));
} }
} }
else if (shelf.Equals(2)) else if (shelf.Equals(2))
...@@ -868,7 +876,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -868,7 +876,8 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck_B, IO_VALUE.LOW)); SetWarnMsg("料盘拿走失败，B料口定位料盘检测信号亮");
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ReelCheck_B, IO_VALUE.LOW));
} }
} }
} }
......
source/XLRStoreClient/FrmXLRStore.Designer.cs
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
this.设备恢复ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设备恢复ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.忽略行走机构运行期间A侧料叉ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.入料机构恢复ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
this.tabPage2.Controls.Add(this.panel1); this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1334, 616); this.tabPage2.Size = new System.Drawing.Size(192, 67);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -168,7 +169,7 @@ ...@@ -168,7 +169,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1334, 616); this.panel1.Size = new System.Drawing.Size(192, 67);
this.panel1.TabIndex = 1; this.panel1.TabIndex = 1;
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -193,7 +194,7 @@ ...@@ -193,7 +194,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1334, 616); this.tableLayoutPanel1.Size = new System.Drawing.Size(192, 67);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// InputControl // InputControl
...@@ -204,11 +205,11 @@ ...@@ -204,11 +205,11 @@
this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2); this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2);
this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill; this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.InputControl.EquipText = "上料机构"; this.InputControl.EquipText = "上料机构";
this.InputControl.Location = new System.Drawing.Point(4, 383); this.InputControl.Location = new System.Drawing.Point(4, 44);
this.InputControl.Margin = new System.Windows.Forms.Padding(4); this.InputControl.Margin = new System.Windows.Forms.Padding(4);
this.InputControl.MoveInfo = "暂无出入库"; this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl"; this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(1326, 109); this.InputControl.Size = new System.Drawing.Size(184, 4);
this.InputControl.TabIndex = 5; this.InputControl.TabIndex = 5;
this.InputControl.WorkStatus = "暂未启动"; this.InputControl.WorkStatus = "暂未启动";
// //
...@@ -218,11 +219,11 @@ ...@@ -218,11 +219,11 @@
this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA1.ColorStatus = System.Drawing.Color.White; this.ReelControlA1.ColorStatus = System.Drawing.Color.White;
this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA1.Location = new System.Drawing.Point(4, 209); this.ReelControlA1.Location = new System.Drawing.Point(4, 26);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4); this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA1.Name = "ReelControlA1"; this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料"; this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(659, 79); this.ReelControlA1.Size = new System.Drawing.Size(88, 1);
this.ReelControlA1.TabIndex = 0; this.ReelControlA1.TabIndex = 0;
// //
// ReelControlA2 // ReelControlA2
...@@ -231,11 +232,11 @@ ...@@ -231,11 +232,11 @@
this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA2.ColorStatus = System.Drawing.Color.White; this.ReelControlA2.ColorStatus = System.Drawing.Color.White;
this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA2.Location = new System.Drawing.Point(4, 296); this.ReelControlA2.Location = new System.Drawing.Point(4, 35);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4); this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA2.Name = "ReelControlA2"; this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料"; this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(659, 79); this.ReelControlA2.Size = new System.Drawing.Size(88, 1);
this.ReelControlA2.TabIndex = 1; this.ReelControlA2.TabIndex = 1;
// //
// ReelControlB1 // ReelControlB1
...@@ -244,11 +245,11 @@ ...@@ -244,11 +245,11 @@
this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB1.ColorStatus = System.Drawing.Color.White; this.ReelControlB1.ColorStatus = System.Drawing.Color.White;
this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB1.Location = new System.Drawing.Point(671, 209); this.ReelControlB1.Location = new System.Drawing.Point(100, 26);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4); this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB1.Name = "ReelControlB1"; this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料"; this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(659, 79); this.ReelControlB1.Size = new System.Drawing.Size(88, 1);
this.ReelControlB1.TabIndex = 2; this.ReelControlB1.TabIndex = 2;
// //
// ReelControlB2 // ReelControlB2
...@@ -257,11 +258,11 @@ ...@@ -257,11 +258,11 @@
this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB2.ColorStatus = System.Drawing.Color.White; this.ReelControlB2.ColorStatus = System.Drawing.Color.White;
this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB2.Location = new System.Drawing.Point(671, 296); this.ReelControlB2.Location = new System.Drawing.Point(100, 35);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4); this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB2.Name = "ReelControlB2"; this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料"; this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(659, 79); this.ReelControlB2.Size = new System.Drawing.Size(88, 1);
this.ReelControlB2.TabIndex = 3; this.ReelControlB2.TabIndex = 3;
// //
// BoxControl // BoxControl
...@@ -276,7 +277,7 @@ ...@@ -276,7 +277,7 @@
this.BoxControl.Margin = new System.Windows.Forms.Padding(4); this.BoxControl.Margin = new System.Windows.Forms.Padding(4);
this.BoxControl.MoveInfo = "暂无出入库"; this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl"; this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(1326, 197); this.BoxControl.Size = new System.Drawing.Size(184, 14);
this.BoxControl.TabIndex = 4; this.BoxControl.TabIndex = 4;
this.BoxControl.WorkStatus = "暂未启动"; this.BoxControl.WorkStatus = "暂未启动";
// //
...@@ -287,11 +288,11 @@ ...@@ -287,11 +288,11 @@
this.ShelfAControl.ColorStatus = System.Drawing.Color.White; this.ShelfAControl.ColorStatus = System.Drawing.Color.White;
this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfAControl.EquipText = "A料口"; this.ShelfAControl.EquipText = "A料口";
this.ShelfAControl.Location = new System.Drawing.Point(4, 500); this.ShelfAControl.Location = new System.Drawing.Point(4, 56);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4); this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfAControl.MoveInfo = "暂无出入库"; this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl"; this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(659, 112); this.ShelfAControl.Size = new System.Drawing.Size(88, 7);
this.ShelfAControl.TabIndex = 6; this.ShelfAControl.TabIndex = 6;
this.ShelfAControl.WorkStatus = "暂未启动"; this.ShelfAControl.WorkStatus = "暂未启动";
// //
...@@ -302,11 +303,11 @@ ...@@ -302,11 +303,11 @@
this.ShelfBControl.ColorStatus = System.Drawing.Color.White; this.ShelfBControl.ColorStatus = System.Drawing.Color.White;
this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfBControl.EquipText = "B料口"; this.ShelfBControl.EquipText = "B料口";
this.ShelfBControl.Location = new System.Drawing.Point(671, 500); this.ShelfBControl.Location = new System.Drawing.Point(100, 56);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4); this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfBControl.MoveInfo = "暂无出入库"; this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl"; this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(659, 112); this.ShelfBControl.Size = new System.Drawing.Size(88, 7);
this.ShelfBControl.TabIndex = 7; this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动"; this.ShelfBControl.WorkStatus = "暂未启动";
// //
...@@ -586,7 +587,8 @@ ...@@ -586,7 +587,8 @@
this.帮助ToolStripMenuItem, this.帮助ToolStripMenuItem,
this.设备恢复ToolStripMenuItem, this.设备恢复ToolStripMenuItem,
this.忽略行走机构运行期间A侧料叉ToolStripMenuItem, this.忽略行走机构运行期间A侧料叉ToolStripMenuItem,
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1}); this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1,
this.入料机构恢复ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1348, 29); this.menuStrip1.Size = new System.Drawing.Size(1348, 29);
...@@ -664,8 +666,8 @@ ...@@ -664,8 +666,8 @@
// //
this.设备恢复ToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.设备恢复ToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.设备恢复ToolStripMenuItem.Name = "设备恢复ToolStripMenuItem"; this.设备恢复ToolStripMenuItem.Name = "设备恢复ToolStripMenuItem";
this.设备恢复ToolStripMenuItem.Size = new System.Drawing.Size(86, 25); this.设备恢复ToolStripMenuItem.Size = new System.Drawing.Size(118, 25);
this.设备恢复ToolStripMenuItem.Text = "设备恢复"; this.设备恢复ToolStripMenuItem.Text = "存储机构恢复";
this.设备恢复ToolStripMenuItem.Visible = false; this.设备恢复ToolStripMenuItem.Visible = false;
this.设备恢复ToolStripMenuItem.Click += new System.EventHandler(this.设备恢复ToolStripMenuItem_Click); this.设备恢复ToolStripMenuItem.Click += new System.EventHandler(this.设备恢复ToolStripMenuItem_Click);
// //
...@@ -685,6 +687,15 @@ ...@@ -685,6 +687,15 @@
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Visible = false; this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Visible = false;
this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Click += new System.EventHandler(this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1_Click); this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Click += new System.EventHandler(this.忽略行走机构运行期间B侧料叉ToolStripMenuItem1_Click);
// //
// 入料机构恢复ToolStripMenuItem
//
this.入料机构恢复ToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.入料机构恢复ToolStripMenuItem.Name = "入料机构恢复ToolStripMenuItem";
this.入料机构恢复ToolStripMenuItem.Size = new System.Drawing.Size(118, 25);
this.入料机构恢复ToolStripMenuItem.Text = "入料机构恢复";
this.入料机构恢复ToolStripMenuItem.Visible = false;
this.入料机构恢复ToolStripMenuItem.Click += new System.EventHandler(this.入料机构恢复ToolStripMenuItem_Click);
//
// tableLayoutPanel2 // tableLayoutPanel2
// //
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
...@@ -861,6 +872,7 @@ ...@@ -861,6 +872,7 @@
private System.Windows.Forms.ToolStripMenuItem 设备恢复ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 设备恢复ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 忽略行走机构运行期间A侧料叉ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 忽略行走机构运行期间A侧料叉ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 忽略行走机构运行期间B侧料叉ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 忽略行走机构运行期间B侧料叉ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 入料机构恢复ToolStripMenuItem;
} }
} }
source/XLRStoreClient/FrmXLRStore.cs
...@@ -3,6 +3,7 @@ using DeviceLibrary; ...@@ -3,6 +3,7 @@ using DeviceLibrary;
using log4net; using log4net;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.DeviceLibrary; using OnlineStore.DeviceLibrary;
using OnlineStore.DeviceLibrary.deviceLibrary;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -586,6 +587,15 @@ namespace OnlineStore.XLRStore ...@@ -586,6 +587,15 @@ namespace OnlineStore.XLRStore
忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Visible = false; 忽略行走机构运行期间B侧料叉ToolStripMenuItem1.Visible = false;
忽略行走机构运行期间A侧料叉ToolStripMenuItem.Visible = false; 忽略行走机构运行期间A侧料叉ToolStripMenuItem.Visible = false;
} }
if (StoreManager.XLRStore?.inputEquip?.MoveStop ?? false)
{
入料机构恢复ToolStripMenuItem.Visible = true;
}
else
{
入料机构恢复ToolStripMenuItem.Visible = false;
}
} }
private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn) private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn)
{ {
...@@ -910,5 +920,11 @@ namespace OnlineStore.XLRStore ...@@ -910,5 +920,11 @@ namespace OnlineStore.XLRStore
{ {
StoreManager.XLRStore.boxEquip.UserPause(false, "用户点击恢复"); StoreManager.XLRStore.boxEquip.UserPause(false, "用户点击恢复");
} }
private void 入料机构恢复ToolStripMenuItem_Click(object sender, EventArgs e)
{
StoreManager.XLRStore.inputEquip.MoveStop = false;
LogUtil.info($"{StoreManager.XLRStore.inputEquip.Name}-用户点击恢复");
}
} }
} }
source/XLRStoreClient/inputForm/FrmInputEquip.cs
...@@ -139,10 +139,6 @@ namespace OnlineStore.XLRStore ...@@ -139,10 +139,6 @@ namespace OnlineStore.XLRStore
btnHlhasReel.Visible = false; btnHlhasReel.Visible = false;
} }
string text = ""; string text = "";
if (inputEquip.MoveStop && !chbMoveStop.Checked)
{
chbMoveStop.Checked = inputEquip.MoveStop;
}
} }
catch (Exception ex) catch (Exception ex)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!