Skip to content

李娜 / SO664-AssemblyLine

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

hybug修改

1 个父辈 a20d2c42
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 83 行增加 和 45 行删除
source/AssemblyLineClient/FrmHYEquip.Designer.cs
...@@ -625,9 +625,9 @@ ...@@ -625,9 +625,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.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(255, 51); this.lblThisSta.Location = new System.Drawing.Point(255, 52);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(470, 119); this.lblThisSta.Size = new System.Drawing.Size(470, 122);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
this.lblHyInfo.AutoSize = true; this.lblHyInfo.AutoSize = true;
this.lblHyInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblHyInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHyInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblHyInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblHyInfo.Location = new System.Drawing.Point(6, 103); this.lblHyInfo.Location = new System.Drawing.Point(6, 117);
this.lblHyInfo.Name = "lblHyInfo"; this.lblHyInfo.Name = "lblHyInfo";
this.lblHyInfo.Size = new System.Drawing.Size(68, 17); this.lblHyInfo.Size = new System.Drawing.Size(68, 17);
this.lblHyInfo.TabIndex = 281; this.lblHyInfo.TabIndex = 281;
......
source/AssemblyLineClient/FrmLineIO.Designer.cs
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
this.HY_TopCylinder_Up = new System.Windows.Forms.Button(); this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label(); this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblMsg = new System.Windows.Forms.Label();
this.chbTray = new System.Windows.Forms.CheckBox(); this.chbTray = new System.Windows.Forms.CheckBox();
this.groupTray = new System.Windows.Forms.GroupBox(); this.groupTray = new System.Windows.Forms.GroupBox();
this.txtTrayLoc = new System.Windows.Forms.TextBox(); this.txtTrayLoc = new System.Windows.Forms.TextBox();
...@@ -363,7 +364,7 @@ ...@@ -363,7 +364,7 @@
this.btnFrontStopDown.Name = "btnFrontStopDown"; this.btnFrontStopDown.Name = "btnFrontStopDown";
this.btnFrontStopDown.Size = new System.Drawing.Size(140, 37); this.btnFrontStopDown.Size = new System.Drawing.Size(140, 37);
this.btnFrontStopDown.TabIndex = 276; this.btnFrontStopDown.TabIndex = 276;
this.btnFrontStopDown.Text = "▉ T3-C1前阻挡上升"; this.btnFrontStopDown.Text = "▉ T3-C1前阻挡下降";
this.btnFrontStopDown.UseVisualStyleBackColor = true; this.btnFrontStopDown.UseVisualStyleBackColor = true;
this.btnFrontStopDown.Click += new System.EventHandler(this.btnSw4Location_Click); this.btnFrontStopDown.Click += new System.EventHandler(this.btnSw4Location_Click);
// //
...@@ -375,7 +376,7 @@ ...@@ -375,7 +376,7 @@
this.btnStopDown.Name = "btnStopDown"; this.btnStopDown.Name = "btnStopDown";
this.btnStopDown.Size = new System.Drawing.Size(140, 37); this.btnStopDown.Size = new System.Drawing.Size(140, 37);
this.btnStopDown.TabIndex = 269; this.btnStopDown.TabIndex = 269;
this.btnStopDown.Text = "▉ T3-C1阻挡上升"; this.btnStopDown.Text = "▉ T3-C1阻挡下降";
this.btnStopDown.UseVisualStyleBackColor = true; this.btnStopDown.UseVisualStyleBackColor = true;
this.btnStopDown.Click += new System.EventHandler(this.btn34Top_Click); this.btnStopDown.Click += new System.EventHandler(this.btn34Top_Click);
// //
...@@ -407,6 +408,7 @@ ...@@ -407,6 +408,7 @@
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Controls.Add(this.chbTray); this.panel1.Controls.Add(this.chbTray);
this.panel1.Controls.Add(this.groupTray); this.panel1.Controls.Add(this.groupTray);
this.panel1.Controls.Add(this.lblMoveInfo); this.panel1.Controls.Add(this.lblMoveInfo);
...@@ -422,6 +424,16 @@ ...@@ -422,6 +424,16 @@
this.panel1.Size = new System.Drawing.Size(1060, 611); this.panel1.Size = new System.Drawing.Size(1060, 611);
this.panel1.TabIndex = 248; this.panel1.TabIndex = 248;
// //
// lblMsg
//
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(821, 522);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(234, 80);
this.lblMsg.TabIndex = 279;
this.lblMsg.Text = "CID";
//
// chbTray // chbTray
// //
this.chbTray.AutoSize = true; this.chbTray.AutoSize = true;
...@@ -744,6 +756,7 @@ ...@@ -744,6 +756,7 @@
private System.Windows.Forms.RadioButton rdbCutreel; private System.Windows.Forms.RadioButton rdbCutreel;
private System.Windows.Forms.RadioButton rdbUrg; private System.Windows.Forms.RadioButton rdbUrg;
private System.Windows.Forms.CheckBox chbTray; private System.Windows.Forms.CheckBox chbTray;
private System.Windows.Forms.Label lblMsg;
} }
} }
source/AssemblyLineClient/FrmLineIO.cs
...@@ -108,6 +108,7 @@ namespace OnlineStore.AssemblyLine ...@@ -108,6 +108,7 @@ namespace OnlineStore.AssemblyLine
if (this.Visible) if (this.Visible)
{ {
lblMsg.Text = LineManager.Line.WarnMsg;
ReadIOList(); ReadIOList();
lblMoveInfo.Text = LineManager.Line.GetMoveStr(); lblMoveInfo.Text = LineManager.Line.GetMoveStr();
lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString(); lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString();
...@@ -376,13 +377,13 @@ namespace OnlineStore.AssemblyLine ...@@ -376,13 +377,13 @@ namespace OnlineStore.AssemblyLine
private void btnSw4Location_Click(object sender, EventArgs e) private void btnSw4Location_Click(object sender, EventArgs e)
{ {
LogUtil.info("界面点击：" + btnFrontStopDown.Text); LogUtil.info("界面点击：" + btnFrontStopDown.Text);
BtnMove(btnFrontStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_FrontStopDown); BtnMove(btnFrontStopDown, "T3-C1前阻挡下降", "T3-C1前阻挡上升", IO_Type.HY_FrontStopDown);
} }
private void btn34Top_Click(object sender, EventArgs e) private void btn34Top_Click(object sender, EventArgs e)
{ {
LogUtil.info("界面点击：" + btnStopDown.Text); LogUtil.info("界面点击：" + btnStopDown.Text);
BtnMove(btnStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_StopDown); BtnMove(btnStopDown, "T3-C1前阻挡下降", "T3-C1前阻挡上升", IO_Type.HY_StopDown);
} }
private void HY_TopCylinder_Down_Click(object sender, EventArgs e) private void HY_TopCylinder_Down_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.chbDisMove = new System.Windows.Forms.CheckBox(); this.chbDisMove = new System.Windows.Forms.CheckBox();
this.lblCardMsg = new System.Windows.Forms.Label();
this.chbDisHy = new System.Windows.Forms.CheckBox(); this.chbDisHy = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.chbLeftDis = new System.Windows.Forms.CheckBox(); this.chbLeftDis = new System.Windows.Forms.CheckBox();
this.chbDisSL = new System.Windows.Forms.CheckBox(); this.chbDisSL = new System.Windows.Forms.CheckBox();
this.chbRightDis = new System.Windows.Forms.CheckBox(); this.chbRightDis = new System.Windows.Forms.CheckBox();
this.lblCardMsg = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label(); this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button(); this.btnUpdateStatus = new System.Windows.Forms.Button();
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.chbDisMove); this.groupBox2.Controls.Add(this.chbDisMove);
this.groupBox2.Controls.Add(this.lblCardMsg); this.groupBox2.Controls.Add(this.lblCardMsg);
this.groupBox2.Controls.Add(this.chbDisHy); this.groupBox2.Controls.Add(this.chbDisHy);
...@@ -207,6 +209,13 @@ ...@@ -207,6 +209,13 @@
this.chbDisMove.UseVisualStyleBackColor = true; this.chbDisMove.UseVisualStyleBackColor = true;
this.chbDisMove.CheckedChanged += new System.EventHandler(this.chbDisMove_CheckedChanged); this.chbDisMove.CheckedChanged += new System.EventHandler(this.chbDisMove_CheckedChanged);
// //
// lblCardMsg
//
this.lblCardMsg.Location = new System.Drawing.Point(7, 333);
this.lblCardMsg.Name = "lblCardMsg";
this.lblCardMsg.Size = new System.Drawing.Size(279, 245);
this.lblCardMsg.TabIndex = 198;
//
// chbDisHy // chbDisHy
// //
this.chbDisHy.AutoSize = true; this.chbDisHy.AutoSize = true;
...@@ -262,13 +271,6 @@ ...@@ -262,13 +271,6 @@
this.chbRightDis.UseVisualStyleBackColor = true; this.chbRightDis.UseVisualStyleBackColor = true;
this.chbRightDis.CheckedChanged += new System.EventHandler(this.chbRightDis_CheckedChanged); this.chbRightDis.CheckedChanged += new System.EventHandler(this.chbRightDis_CheckedChanged);
// //
// lblCardMsg
//
this.lblCardMsg.Location = new System.Drawing.Point(7, 333);
this.lblCardMsg.Name = "lblCardMsg";
this.lblCardMsg.Size = new System.Drawing.Size(279, 245);
this.lblCardMsg.TabIndex = 198;
//
// groupBox1 // groupBox1
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -729,54 +731,54 @@ ...@@ -729,54 +731,54 @@
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
// //
// 启动AToolStripMenuItem // 启动AToolStripMenuItem
// //
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem"; this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Text = "启动 "; this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click); this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
// //
// 复位RToolStripMenuItem // 复位RToolStripMenuItem
// //
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem"; this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Text = "复位"; this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click); this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
// //
// 停止TToolStripMenuItem // 停止TToolStripMenuItem
// //
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem"; this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Text = "停止"; this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click); this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Visible = false; this.toolStripSeparator2.Visible = false;
// //
// 退出ToolStripMenuItem // 退出ToolStripMenuItem
// //
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem"; this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1); this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
// //
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -430,7 +430,7 @@ namespace OnlineStore.AssemblyLine ...@@ -430,7 +430,7 @@ namespace OnlineStore.AssemblyLine
} }
lblStatus.Text = lineBean.GetRunStr() + canScanCode; lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString(); string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n"; string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : (time + LineManager.Line.WarnMsg + "\r\n");
if (TrayManager.TrayErrorMsg.Equals("").Equals(false)) if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
{ {
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -207,18 +207,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -207,18 +207,18 @@ namespace OnlineStore.DeviceLibrary
} }
public void ChangeDebug(bool isDebug) public void ChangeDebug(bool isDebug)
{ {
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.HYEquip)) if (baseConfig.DType.Equals(DeviceType.MoveEquip))
{ {
if (isDebug) if (isDebug)
{ {
IsDebug = true; IsDebug = true;
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH); IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH); IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
LogInfo("从正常状态切换到调试状态！"); LogInfo("从正常状态切换到调试状态！");
} }
else else
{ {
IsDebug = false; IsDebug = false;
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH); IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW); IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
LogInfo("从调试状态切换到正常状态！"); LogInfo("从调试状态切换到正常状态！");
...@@ -228,12 +228,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -228,12 +228,12 @@ namespace OnlineStore.DeviceLibrary
{ {
if (isDebug) if (isDebug)
{ {
IsDebug = true; IsDebug = true;
LogInfo("从正常状态切换到调试状态！"); LogInfo("从正常状态切换到调试状态！");
} }
else else
{ {
IsDebug = false; IsDebug = false;
LogInfo("从调试状态切换到正常状态！"); LogInfo("从调试状态切换到正常状态！");
} }
} }
...@@ -283,7 +283,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -283,7 +283,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return true; return true;
} }
return false; return true;
} }
internal virtual void CloseStopBlock() internal virtual void CloseStopBlock()
{ {
...@@ -569,7 +569,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -569,7 +569,15 @@ namespace OnlineStore.DeviceLibrary
protected void CheckLog(string msg) protected void CheckLog(string msg)
{ {
LogUtil.debug(Name +"" +msg); if (DeviceID.Equals(201) || DeviceID.Equals(201))
{
LogUtil.info(Name + "" + msg);
}
else
{
LogUtil.debug(Name + "" + msg);
}
} }
protected void InLog(string msg) protected void InLog(string msg)
{ {
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -165,7 +165,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -165,7 +165,14 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
FixtureProcess(); if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{
ResetProcess();
}
else
{
FixtureProcess();
}
} }
} }
} }
...@@ -461,7 +468,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -461,7 +468,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY52_TopUp); MoveInfo.NextMoveStep(LineMoveStep.HY52_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升上升，定位下降，横移阻挡气缸下降，出料线阻挡气缸上升"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升上升，定位下降，横移阻挡气缸下降，出料线阻挡气缸上升");
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
HY_StopCylinderDown(MoveInfo); HY_StopCylinderDown(MoveInfo);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
} }
...@@ -502,7 +509,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -502,7 +509,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY61_TopDown); MoveInfo.NextMoveStep(LineMoveStep.HY61_TopDown);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升下降，横移阻挡气缸上升，出料线阻挡气缸上升 "); CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升下降，横移阻挡气缸上升，出料线阻挡气缸上升 ");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
} }
...@@ -532,7 +539,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -532,7 +539,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY73_OL_TopUp); MoveInfo.NextMoveStep(LineMoveStep.HY73_OL_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始横移，顶升上升，出料线阻挡气缸下降,横移阻挡气缸上升"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始横移，顶升上升，出料线阻挡气缸下降,横移阻挡气缸上升");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
OL_StopCylinderDown(MoveInfo); OL_StopCylinderDown(MoveInfo);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
} }
...@@ -568,7 +575,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -568,7 +575,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.HY78_OL_TopDown); MoveInfo.NextMoveStep(LineMoveStep.HY78_OL_TopDown);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 电机停止，顶升下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 电机停止，顶升下降 ，出料线阻挡上升，出料线阻挡气缸上升，横移阻挡气缸上升");
LineStop(MoveInfo); LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.TopCylinder_Down);
IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
...@@ -641,7 +648,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -641,7 +648,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY31_IOL_TopUp); MoveInfo.NextMoveStep(LineMoveStep.HY31_IOL_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始C1->出料线横移，顶升上升，横移阻挡气缸上升，出料线阻挡气缸下降"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 开始C1->出料线横移，顶升上升，横移阻挡气缸上升，出料线阻挡气缸下降");
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
OL_StopCylinderDown(MoveInfo); OL_StopCylinderDown(MoveInfo);
} }
...@@ -650,7 +657,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -650,7 +657,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY11_TopUpToHY); MoveInfo.NextMoveStep(LineMoveStep.HY11_TopUpToHY);
CheckLog("托盘横移" + MoveInfo.SLog + " ，开始C1->C1分流横移，顶升上升，横移阻挡气缸下降，出料线阻挡气缸上升"); CheckLog("托盘横移" + MoveInfo.SLog + " ，开始C1->C1分流横移，顶升上升，横移阻挡气缸下降，出料线阻挡气缸上升");
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
HY_StopCylinderDown(MoveInfo); HY_StopCylinderDown(MoveInfo);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
...@@ -129,7 +129,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -129,7 +129,14 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
FixtureProcess(); if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{
ResetProcess();
}
else
{
FixtureProcess();
}
} }
} }
} }
...@@ -269,7 +276,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,7 +276,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.OHY12_TopUp); MoveInfo.NextMoveStep(LineMoveStep.OHY12_TopUp);
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸上升"); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸上升");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY12_TopUp)) else if (MoveInfo.IsStep(LineMoveStep.OHY12_TopUp))
{ {
...@@ -297,7 +304,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -297,7 +304,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY16_TopDown); MoveInfo.NextMoveStep(LineMoveStep.OHY16_TopDown);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸下降"); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸下降");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY16_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.OHY16_TopDown))
{ {
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -110,9 +110,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -110,9 +110,9 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = true; mainTimer.Enabled = true;
IoCheckTimer.Enabled = true; IoCheckTimer.Enabled = true;
AgvClient.Init();
canStart = true; canStart = true;
//AgvClient.Init();
}); });
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (span.TotalSeconds > checkWaitInfo.TimeOutSeconds) else if (span.TotalSeconds > checkWaitInfo.TimeOutSeconds)
{ {
WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + FormUtil.GetSpanStr(span) + "]秒"; WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + FormUtil.GetSpanStr(span) + "] ";
LogUtil.error(WarnMsg, 900); LogUtil.error(WarnMsg, 900);
Alarm(LineAlarmType.IoSingleTimeOut); Alarm(LineAlarmType.IoSingleTimeOut);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!