Skip to content

李娜 / SO664-AssemblyLine

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

横移出口顶升下降时线体未停止

1 个父辈 120a55c1
内嵌 并排
正在显示 7 个修改的文件 包含 54 行增加 和 17 行删除
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -35,6 +35,7 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupDo = new System.Windows.Forms.GroupBox();
this.HY_OL_StopDown = new System.Windows.Forms.Button();
this.HY_LongL_StopDown = new System.Windows.Forms.Button();
this.HY_OL_StopCylinder_Down = new System.Windows.Forms.Button();
this.HY_ShortL_StopDown = new System.Windows.Forms.Button();
......@@ -358,6 +359,7 @@
//
// groupDo
//
this.groupDo.Controls.Add(this.HY_OL_StopDown);
this.groupDo.Controls.Add(this.HY_LongL_StopDown);
this.groupDo.Controls.Add(this.HY_OL_StopCylinder_Down);
this.groupDo.Controls.Add(this.HY_ShortL_StopDown);
......@@ -383,6 +385,19 @@
this.groupDo.TabStop = false;
this.groupDo.Text = "IO操作测试";
//
// HY_OL_StopDown
//
this.HY_OL_StopDown.BackColor = System.Drawing.Color.White;
this.HY_OL_StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.HY_OL_StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.HY_OL_StopDown.Location = new System.Drawing.Point(176, 107);
this.HY_OL_StopDown.Name = "HY_OL_StopDown";
this.HY_OL_StopDown.Size = new System.Drawing.Size(140, 34);
this.HY_OL_StopDown.TabIndex = 281;
this.HY_OL_StopDown.Text = "▉ 出料线侧阻挡下降";
this.HY_OL_StopDown.UseVisualStyleBackColor = false;
this.HY_OL_StopDown.Click += new System.EventHandler(this.HY_OL_StopDown_Click);
//
// HY_LongL_StopDown
//
this.HY_LongL_StopDown.BackColor = System.Drawing.Color.White;
......@@ -1087,6 +1102,7 @@
private System.Windows.Forms.Button HY_StopCylinder_Up;
private System.Windows.Forms.Button HY_LongL_StopDown;
private System.Windows.Forms.Button HY_ShortL_StopDown;
private System.Windows.Forms.Button HY_OL_StopDown;
}
}
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -632,7 +632,12 @@ namespace OnlineStore.AssemblyLine
equipBean.MoveStop = chbMoveStop.Checked;
LogUtil.info(equipBean.Name + "用户切换是否暂停： " + equipBean.MoveStop);
}
}
private void HY_OL_StopDown_Click(object sender, EventArgs e)
{
DoBtnClick(sender);
}
}
}
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -434,17 +434,21 @@ namespace OnlineStore.AssemblyLine
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : (time + LineManager.Line.WarnMsg + "\r\n");
if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
string warnMsg = "";
if (LineManager.Line.runStatus > LineRunStatus.Wait)
{
warnMsg += TrayManager.TrayErrorMsg + "\r\n";
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : (time + LineManager.Line.WarnMsg + "\r\n");
if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
{
warnMsg += TrayManager.TrayErrorMsg + "\r\n";
}
}
foreach (EquipBase move in lineBean.AllEquipMap.Values)
{
if (move.WarnMsg.Equals("").Equals(false))
if (move.runStatus > LineRunStatus.Wait && (move.WarnMsg.Equals("").Equals(false)))
{
if (move.alarmType.Equals(LineAlarmType.None).Equals(false))
{
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
......@@ -158,19 +158,21 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarn.ForeColor = System.Drawing.Color.Red;
this.lblWarn.ForeColor = System.Drawing.Color.White;
this.lblWarn.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.lblWarn.Location = new System.Drawing.Point(3, 72);
this.lblWarn.Name = "lblWarn";
this.lblWarn.Size = new System.Drawing.Size(242, 45);
this.lblWarn.TabIndex = 8;
this.lblWarn.Text = "暂无报警";
this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblWarn.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
// EquipControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
this.BackColor = System.Drawing.Color.LightCoral;
this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Controls.Add(this.panName);
this.Controls.Add(this.lblBox);
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
......@@ -511,6 +511,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY56_CheckWait))
{
//托盘已到位，更新托盘号，判断是否需要取放料
LineStop();
UpdateTrayNum();
//判断是否需要进出料线的料
if (TrayNeedToOutLine(currTrayNum))
......@@ -520,7 +521,8 @@ namespace OnlineStore.DeviceLibrary
else
{
MoveInfo.NextMoveStep(LineMoveStep.HY61_TopDown);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升下降，横移阻挡气缸上升，出料线阻挡气缸上升 ");
CheckLog("托盘阻挡" + MoveInfo.SLog + " 横移电机停止，顶升下降，横移阻挡气缸上升，出料线阻挡气缸上升 ");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
HY_StopCylinderUp(MoveInfo);
OL_StopCylinderUp(MoveInfo);
......@@ -530,7 +532,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY61_TopDown))
{
MoveInfo.NextMoveStep(LineMoveStep.HY92_StopDown);
CheckLog("放盘离开" + MoveInfo.SLog + " ，阻挡下降 ");
CheckLog("放盘离开" + MoveInfo.SLog + " 横移电机停止，阻挡下降 ");
LineStop(MoveInfo);
IOMove(IO_Type.HY_StopDown, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
}
......@@ -660,7 +663,8 @@ namespace OnlineStore.DeviceLibrary
private void HY31_IOL_TopUp()
{
MoveInfo.NextMoveStep(LineMoveStep.HY31_IOL_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始C1->出料线横移，顶升上升，横移阻挡气缸上升，出料线阻挡气缸下降");
CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始C1->出料线横移，横移电机停止，顶升上升，横移阻挡气缸上升，出料线阻挡气缸下降");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
HY_StopCylinderUp(MoveInfo);
OL_StopCylinderDown(MoveInfo);
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -480,13 +480,15 @@ namespace OnlineStore.DeviceLibrary
if (TrayNeedSL(currTrayNum))
{
MoveInfo.NextMoveStep(LineMoveStep.HY57_SL_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升上升 ");
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升上升，横移电机停止 ");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
else
{
MoveInfo.NextMoveStep(LineMoveStep.HY61_TopDown);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升下降 ");
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升下降，横移电机停止 ");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
......@@ -155,6 +155,7 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_05_TrayCheck))
{
//读取托盘号
LineStop();
UpdateTrayNum();
if (ReelNeedMove())
{
......@@ -163,7 +164,8 @@ namespace OnlineStore.DeviceLibrary
else if (ReelNeedToNG())
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_07_TopUp);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：需要移到NG箱，顶升气缸上升");
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：需要移到NG箱，顶升气缸上升，横移电机停止");
LineStop(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
else
......@@ -249,7 +251,8 @@ namespace OnlineStore.DeviceLibrary
private void JHY_11_TopDown()
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：阻挡上升，顶升气缸下降");
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：横移电机停止，阻挡上升，顶升气缸下降");
LineStop(SecondMoveInfo);
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
if (IsNgPro())
{
......@@ -275,7 +278,8 @@ namespace OnlineStore.DeviceLibrary
if (LastWidth > 0)
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_07_TopUp);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸上升");
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：横移电机停止，顶升气缸上升");
LineStop(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
else
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!