Skip to content

李娜 / SO827-AssemblyLine

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

上料机构优化

1 个父辈 e7c7b2c1
内嵌 并排
正在显示 4 个修改的文件 包含 31 行增加 和 13 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -613,7 +613,7 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(406, 85);
this.lblThisSta.Location = new System.Drawing.Point(406, 176);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(526, 259);
this.lblThisSta.TabIndex = 246;
......@@ -668,7 +668,7 @@
this.btnUpdateShelf.BackColor = System.Drawing.Color.White;
this.btnUpdateShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateShelf.Location = new System.Drawing.Point(119, 435);
this.btnUpdateShelf.Location = new System.Drawing.Point(119, 526);
this.btnUpdateShelf.Name = "btnUpdateShelf";
this.btnUpdateShelf.Size = new System.Drawing.Size(110, 40);
this.btnUpdateShelf.TabIndex = 281;
......@@ -679,7 +679,7 @@
// txtShelfID
//
this.txtShelfID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtShelfID.Location = new System.Drawing.Point(13, 444);
this.txtShelfID.Location = new System.Drawing.Point(13, 535);
this.txtShelfID.MaxLength = 6;
this.txtShelfID.Name = "txtShelfID";
this.txtShelfID.Size = new System.Drawing.Size(100, 26);
......@@ -687,21 +687,22 @@
//
// lblwidth
//
this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(6, 19);
this.lblwidth.Location = new System.Drawing.Point(6, 17);
this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(122, 21);
this.lblwidth.Size = new System.Drawing.Size(967, 117);
this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度：";
this.lblwidth.Text = "当前料盘：";
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(6, 73);
this.lblMoveInfo.Location = new System.Drawing.Point(6, 164);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 278;
......@@ -712,7 +713,7 @@
this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(6, 48);
this.lblAgvInfo.Location = new System.Drawing.Point(6, 139);
this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 276;
......@@ -725,7 +726,7 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(406, 258);
this.lblInstoreList.Location = new System.Drawing.Point(406, 349);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(406, 109);
this.lblInstoreList.TabIndex = 277;
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -584,6 +584,8 @@ namespace OnlineStore.DeviceLibrary
InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P1点 [" + Config.UpDownAxisP1 + "] 更新托盘信息【" + tray.ToStr() + "】");
SServerManager.SendPosToStoreCheck(Name, LastPosParam.Clone());
}
//托盘提前顶升下降
LineManager.Line.TrayTopDown(DeviceID);
}
else if (MoveInfo.IsStep(LineMoveStep.FI_35_AxisToP1))
{
......@@ -1177,7 +1179,7 @@ namespace OnlineStore.DeviceLibrary
return true;
}
//入料执行中， 可以提前拦截托盘
if (MoveInfo.MoveStep >= LineMoveStep.FI_27_CylinderGive && MoveInfo.MoveStep <= LineMoveStep.FI_32_WaitTray)
else if (MoveInfo.MoveStep >= LineMoveStep.FI_26_BatchAxisToP3 && MoveInfo.MoveStep <= LineMoveStep.FI_32_WaitTray)
{
//如果报警直接离开
if ((!alarmType.Equals(LineAlarmType.None)) || WarnMsg.Contains("获取库位号超时"))
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -688,6 +688,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + "TrayCanLeave ：当前托盘不在等待中，不需要处理");
}
}
#region 阻挡气缸处理
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -397,8 +397,22 @@ namespace OnlineStore.DeviceLibrary
}
}
}
internal void TrayTopDown(int deviceID)
{
foreach (HYEquipBase hy in HYEquipMap.Values)
{
if (hy.Config.WorkDeviceId.Equals(deviceID))
{
//顶升气缸提前下降
hy.LocationCylinderDown(null);
hy.CylinderMove(null,IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
break;
}
}
}
#endregion
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!