Skip to content

李娜 / SO827-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 709fde5a 由 LN
选项

增加夹爪是否有料检测功能。进仓界面增加忽略料叉信号功能

1 个父辈 e4b585f4
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 71 行增加 和 13 行删除
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
this.btnClear = new System.Windows.Forms.Button(); this.btnClear = new System.Windows.Forms.Button();
this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl(); this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnHlhasReel = new System.Windows.Forms.Button();
this.lblInoutInfo = new System.Windows.Forms.Label(); this.lblInoutInfo = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label(); this.lblInstoreList = new System.Windows.Forms.Label();
...@@ -477,7 +478,7 @@ ...@@ -477,7 +478,7 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(244, 126); this.lblThisSta.Location = new System.Drawing.Point(244, 129);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(724, 28); this.lblThisSta.Size = new System.Drawing.Size(724, 28);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
...@@ -568,6 +569,7 @@ ...@@ -568,6 +569,7 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.btnHlhasReel);
this.groupBox6.Controls.Add(this.lblInoutInfo); this.groupBox6.Controls.Add(this.lblInoutInfo);
this.groupBox6.Controls.Add(this.lblMoveInfo); this.groupBox6.Controls.Add(this.lblMoveInfo);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
...@@ -579,6 +581,19 @@ ...@@ -579,6 +581,19 @@
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "当前状态"; this.groupBox6.Text = "当前状态";
// //
// btnHlhasReel
//
this.btnHlhasReel.BackColor = System.Drawing.Color.White;
this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHlhasReel.Location = new System.Drawing.Point(843, 14);
this.btnHlhasReel.Name = "btnHlhasReel";
this.btnHlhasReel.Size = new System.Drawing.Size(121, 35);
this.btnHlhasReel.TabIndex = 287;
this.btnHlhasReel.Text = "忽略夹爪有料信号";
this.btnHlhasReel.UseVisualStyleBackColor = false;
this.btnHlhasReel.Visible = false;
this.btnHlhasReel.Click += new System.EventHandler(this.btnHlhasReel_Click);
//
// lblInoutInfo // lblInoutInfo
// //
this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -608,9 +623,9 @@ ...@@ -608,9 +623,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(244, 44); this.lblInstoreList.Location = new System.Drawing.Point(244, 57);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(724, 77); this.lblInstoreList.Size = new System.Drawing.Size(724, 66);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage2 // tabPage2
...@@ -1139,6 +1154,7 @@ ...@@ -1139,6 +1154,7 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox cmbP3Width; private System.Windows.Forms.ComboBox cmbP3Width;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.Button btnHlhasReel;
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -157,7 +157,7 @@ namespace OnlineStore.AssemblyLine ...@@ -157,7 +157,7 @@ namespace OnlineStore.AssemblyLine
lblInoutInfo.Text = (equipBean.MoveInfo.MoveType.Equals(LineMoveType.InStore) ? "入库：" : "出库：") + equipBean.MoveInfo.MoveParam.ToStr(); lblInoutInfo.Text = (equipBean.MoveInfo.MoveType.Equals(LineMoveType.InStore) ? "入库：" : "出库：") + equipBean.MoveInfo.MoveParam.ToStr();
} }
else else
{ {
lblInoutInfo.Text = "出料：" + equipBean.MoveInfo.MoveParam.ToStr(); lblInoutInfo.Text = "出料：" + equipBean.MoveInfo.MoveParam.ToStr();
} }
} }
...@@ -165,7 +165,7 @@ namespace OnlineStore.AssemblyLine ...@@ -165,7 +165,7 @@ namespace OnlineStore.AssemblyLine
{ {
lblInoutInfo.Text = ""; lblInoutInfo.Text = "";
} }
lblMoveInfo.Text = equipBean.GetMoveStr() +"料仓类型：" + (equipBean.Config.IsBigTray.Equals(1) ? "大料盘" : "小料盘"); lblMoveInfo.Text = equipBean.GetMoveStr() + "料仓类型：" + (equipBean.Config.IsBigTray.Equals(1) ? "大料盘" : "小料盘");
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库" : "不可出库"; string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库" : "不可出库";
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus) + "(" + canOut + ")"; lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus) + "(" + canOut + ")";
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
...@@ -198,6 +198,14 @@ namespace OnlineStore.AssemblyLine ...@@ -198,6 +198,14 @@ namespace OnlineStore.AssemblyLine
{ {
lblInstoreList.Text = text; lblInstoreList.Text = text;
} }
if (equipBean.IsNoReelAlarm() && (!equipBean.ClampEmptyMove))
{
btnHlhasReel.Visible = true;
}
else
{
btnHlhasReel.Visible = false;
}
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -777,6 +785,15 @@ namespace OnlineStore.AssemblyLine ...@@ -777,6 +785,15 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
private void btnHlhasReel_Click(object sender, EventArgs e)
{
if (equipBean.IsNoReelAlarm())
{
equipBean.ClampEmptyMove = true;
LogUtil.info(equipBean.Name + "界面点击：" + btnHlhasReel.Text + ",设置ClampEmptyMove=true ");
}
}
} }
} }
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -572,6 +572,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -572,6 +572,12 @@ namespace OnlineStore.DeviceLibrary
if (ClampJwa != null) if (ClampJwa != null)
{ {
wait.IsEnd = ClampJwa.HasReel(); wait.IsEnd = ClampJwa.HasReel();
if ((!wait.IsEnd) && IsNoReelAlarm() && ClampEmptyMove)
{
LogUtil.info(Name + " 用户点击了：忽略夹爪有料信号，继续出入库动作");
wait.IsEnd = true;
}
} }
} }
else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK)) else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
...@@ -772,5 +778,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -772,5 +778,22 @@ namespace OnlineStore.DeviceLibrary
} }
return Color.White; return Color.White;
} }
public bool ClampEmptyMove = false;
public bool IsNoReelAlarm()
{
if (runStatus.Equals(LineRunStatus.Busy))
{
if (MoveInfo.MoveType.Equals(LineMoveType.InStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MI_07_WaitHasReel))
{
return true;
}
else if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_WaitHasReel))
{
return true;
}
}
return false;
}
} }
} }
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -385,9 +385,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -385,9 +385,9 @@ namespace OnlineStore.DeviceLibrary
if (UpdownIsInP1()) if (UpdownIsInP1())
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_25_CheckTray); MoveInfo.NextMoveStep(LineMoveStep.FI_25_CheckTray);
InLog("料盘移栽" + MoveInfo.SLog + "：等待 SL_AxisLocationCheck=LOW"); InLog("料盘移栽" + MoveInfo.SLog + "：等待 SL_AxisLocationCheck=LOW 且夹爪有料");
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_ClampCylinder_Check, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_AxisLocationCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_AxisLocationCheck, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
} }
else else
{ {
......
source/DeviceLibrary/baan/ClampJawBean.cs
...@@ -61,9 +61,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -61,9 +61,9 @@ namespace OnlineStore.DeviceLibrary
if (checkHasReel) if (checkHasReel)
{ {
moveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel()); moveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
//有一个到位就算到位
moveInfo.OneWaitCanEndStep = true;
} }
//有一个到位就算到位
moveInfo.OneWaitCanEndStep = true;
} }
} }
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -156,15 +156,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -156,15 +156,17 @@ namespace OnlineStore.DeviceLibrary
///移载装置入库处理，夹料气缸1夹紧 ///移载装置入库处理，夹料气缸1夹紧
/// </summary> /// </summary>
MI_05_CylinderOpen, MI_05_CylinderOpen,
/// <summary> /// <summary>
///移载装置入库处理，上下气缸1上升 ///移载装置入库处理，上下气缸1上升
/// </summary> /// </summary>
MI_06_CylinderUp, MI_06_CylinderUp,
/// <summary> /// <summary>
/// 移载装置入库处理，检测夹爪料盘检测信号 /// 移载装置入库处理，等待夹爪有料
/// </summary> /// </summary>
MI_07_ClampCheck, MI_07_WaitHasReel,
/// <summary> /// <summary>
/// 移载装置入库处理，等待box等待状态才能继续操作 /// 移载装置入库处理，等待box等待状态才能继续操作
...@@ -332,9 +334,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -332,9 +334,9 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
MO_56_ResetClamp, MO_56_ResetClamp,
/// <summary> /// <summary>
/// 移栽出库。 夹料气缸检测 /// 移栽出库。 等待夹爪有料
/// </summary> /// </summary>
MO_57_ClampCheck, MO_57_WaitHasReel,
/// <summary> /// <summary>
/// 移栽出库：开始等待托盘 /// 移栽出库：开始等待托盘
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!