Skip to content

李娜 / SO664-AssemblyLine

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

1，上料横移到达流水线上方时再检测盘宽。2.T3-C1bug修改。3.接驳台bug修改

1 个父辈 6146271c
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 131 行增加 和 67 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -252,13 +252,15 @@ namespace OnlineStore.AssemblyLine ...@@ -252,13 +252,15 @@ namespace OnlineStore.AssemblyLine
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString(); txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
txtUpdownP3.Text = equipBean.Config.UpDownAxisP3.ToString(); txtUpdownP3.Text = equipBean.Config.UpDownAxisP3.ToString();
if (equipBean.Config.DOList.ContainsKey(IO_Type.SL_RollerLine_Run)) if (equipBean.HasOutLine)
{ {
SL_RollerLine_Run.Visible = true; SL_RollerLine_Run.Visible = true;
SL_OutLine_Run.Visible = true;
} }
else else
{ {
SL_RollerLine_Run.Visible = false; SL_RollerLine_Run.Visible = false;
SL_OutLine_Run.Visible = false ;
} }
LoadDP2(); LoadDP2();
LoadDOBtn(groupDO); LoadDOBtn(groupDO);
......
source/AssemblyLineClient/FrmLineIO.cs
...@@ -377,13 +377,13 @@ namespace OnlineStore.AssemblyLine ...@@ -377,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
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
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.chbTrayTest = new System.Windows.Forms.CheckBox();
this.chbDisMove = new System.Windows.Forms.CheckBox(); this.chbDisMove = new System.Windows.Forms.CheckBox();
this.lblCardMsg = new System.Windows.Forms.Label(); this.lblCardMsg = new System.Windows.Forms.Label();
this.chbDisHy = new System.Windows.Forms.CheckBox(); this.chbDisHy = new System.Windows.Forms.CheckBox();
...@@ -187,6 +188,7 @@ ...@@ -187,6 +188,7 @@
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.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)));
this.groupBox2.Controls.Add(this.chbTrayTest);
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);
...@@ -200,10 +202,21 @@ ...@@ -200,10 +202,21 @@
this.groupBox2.TabIndex = 200; this.groupBox2.TabIndex = 200;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// chbTrayTest
//
this.chbTrayTest.AutoSize = true;
this.chbTrayTest.Location = new System.Drawing.Point(9, 22);
this.chbTrayTest.Name = "chbTrayTest";
this.chbTrayTest.Size = new System.Drawing.Size(168, 24);
this.chbTrayTest.TabIndex = 203;
this.chbTrayTest.Text = "托盘横移到出料线测试";
this.chbTrayTest.UseVisualStyleBackColor = true;
this.chbTrayTest.CheckedChanged += new System.EventHandler(this.chbTrayTest_CheckedChanged);
//
// chbDisMove // chbDisMove
// //
this.chbDisMove.AutoSize = true; this.chbDisMove.AutoSize = true;
this.chbDisMove.Location = new System.Drawing.Point(9, 205); this.chbDisMove.Location = new System.Drawing.Point(9, 222);
this.chbDisMove.Name = "chbDisMove"; this.chbDisMove.Name = "chbDisMove";
this.chbDisMove.Size = new System.Drawing.Size(144, 24); this.chbDisMove.Size = new System.Drawing.Size(144, 24);
this.chbDisMove.TabIndex = 202; this.chbDisMove.TabIndex = 202;
...@@ -221,7 +234,7 @@ ...@@ -221,7 +234,7 @@
// chbDisHy // chbDisHy
// //
this.chbDisHy.AutoSize = true; this.chbDisHy.AutoSize = true;
this.chbDisHy.Location = new System.Drawing.Point(9, 165); this.chbDisHy.Location = new System.Drawing.Point(9, 187);
this.chbDisHy.Name = "chbDisHy"; this.chbDisHy.Name = "chbDisHy";
this.chbDisHy.Size = new System.Drawing.Size(194, 24); this.chbDisHy.Size = new System.Drawing.Size(194, 24);
this.chbDisHy.TabIndex = 201; this.chbDisHy.TabIndex = 201;
...@@ -234,7 +247,7 @@ ...@@ -234,7 +247,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red; this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.Location = new System.Drawing.Point(6, 277); this.label2.Location = new System.Drawing.Point(6, 292);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(224, 17); this.label2.Size = new System.Drawing.Size(224, 17);
this.label2.TabIndex = 200; this.label2.TabIndex = 200;
...@@ -243,7 +256,7 @@ ...@@ -243,7 +256,7 @@
// chbLeftDis // chbLeftDis
// //
this.chbLeftDis.AutoSize = true; this.chbLeftDis.AutoSize = true;
this.chbLeftDis.Location = new System.Drawing.Point(9, 29); this.chbLeftDis.Location = new System.Drawing.Point(9, 67);
this.chbLeftDis.Name = "chbLeftDis"; this.chbLeftDis.Name = "chbLeftDis";
this.chbLeftDis.Size = new System.Drawing.Size(277, 24); this.chbLeftDis.Size = new System.Drawing.Size(277, 24);
this.chbLeftDis.TabIndex = 196; this.chbLeftDis.TabIndex = 196;
...@@ -254,7 +267,7 @@ ...@@ -254,7 +267,7 @@
// chbDisSL // chbDisSL
// //
this.chbDisSL.AutoSize = true; this.chbDisSL.AutoSize = true;
this.chbDisSL.Location = new System.Drawing.Point(9, 125); this.chbDisSL.Location = new System.Drawing.Point(9, 152);
this.chbDisSL.Name = "chbDisSL"; this.chbDisSL.Name = "chbDisSL";
this.chbDisSL.Size = new System.Drawing.Size(192, 24); this.chbDisSL.Size = new System.Drawing.Size(192, 24);
this.chbDisSL.TabIndex = 199; this.chbDisSL.TabIndex = 199;
...@@ -265,7 +278,7 @@ ...@@ -265,7 +278,7 @@
// chbRightDis // chbRightDis
// //
this.chbRightDis.AutoSize = true; this.chbRightDis.AutoSize = true;
this.chbRightDis.Location = new System.Drawing.Point(9, 69); this.chbRightDis.Location = new System.Drawing.Point(9, 101);
this.chbRightDis.Name = "chbRightDis"; this.chbRightDis.Name = "chbRightDis";
this.chbRightDis.Size = new System.Drawing.Size(293, 24); this.chbRightDis.Size = new System.Drawing.Size(293, 24);
this.chbRightDis.TabIndex = 197; this.chbRightDis.TabIndex = 197;
...@@ -1259,6 +1272,7 @@ ...@@ -1259,6 +1272,7 @@
private System.Windows.Forms.CheckBox chbDisHy; private System.Windows.Forms.CheckBox chbDisHy;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox chbTrayTest;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -1116,17 +1116,18 @@ namespace OnlineStore.AssemblyLine ...@@ -1116,17 +1116,18 @@ namespace OnlineStore.AssemblyLine
if (LineManager.DisLeftOutLine) if (LineManager.DisLeftOutLine)
{ {
List<int> leftHYs = new List<int>() { 205, 207, 210 };
foreach (int id in leftHYs)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine+"，设置 HY5，HY7，HY10 为调试状态"); LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine+"，设置 HY5，HY7，HY10 为调试状态");
} }
else else
{ {
LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine); LogUtil.info("界面点击勾选：" + chbLeftDis.Text + "=" + LineManager.DisLeftOutLine);
} }
List<int> leftHYs = new List<int>() { 205, 207, 210 };
foreach (int id in leftHYs)
{
bool isD = LineManager.DisLeftOutLine ? true: LineManager.Line.HYEquipMap[id].Config.IsDebug.Equals(1);
LineManager.Line.HYEquipMap[id].IsDebug = isD;
}
} }
private void chbRightDis_CheckedChanged(object sender, EventArgs e) private void chbRightDis_CheckedChanged(object sender, EventArgs e)
...@@ -1142,17 +1143,18 @@ namespace OnlineStore.AssemblyLine ...@@ -1142,17 +1143,18 @@ namespace OnlineStore.AssemblyLine
LineManager.DisRightOutLine = chbRightDis.Checked; LineManager.DisRightOutLine = chbRightDis.Checked;
if (LineManager.DisRightOutLine) if (LineManager.DisRightOutLine)
{ {
List<int> rightHYs = new List<int>() { 212, 214, 217 };
foreach (int id in rightHYs)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine + "，设置 HY12，HY14，HY17 为调试状态"); LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine + "，设置 HY12，HY14，HY17 为调试状态");
} }
else else
{ {
LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine); LogUtil.info("界面点击勾选：" + chbRightDis.Text + "=" + LineManager.DisRightOutLine);
} }
List<int> rightHYs = new List<int>() { 212, 214, 217 };
foreach (int id in rightHYs)
{
bool isD = LineManager.DisRightOutLine ? true : LineManager.Line.HYEquipMap[id].Config.IsDebug.Equals(1);
LineManager.Line.HYEquipMap[id].IsDebug = isD;
}
} }
private void chbDisSL_CheckedChanged(object sender, EventArgs e) private void chbDisSL_CheckedChanged(object sender, EventArgs e)
...@@ -1168,17 +1170,18 @@ namespace OnlineStore.AssemblyLine ...@@ -1168,17 +1170,18 @@ namespace OnlineStore.AssemblyLine
LineManager.DisSLEquip = chbDisSL.Checked; LineManager.DisSLEquip = chbDisSL.Checked;
if (LineManager.DisSLEquip) if (LineManager.DisSLEquip)
{ {
List<int> rightHYs = new List<int>() { 101, 102, 103,104,105 };
foreach (int id in rightHYs)
{
LineManager.Line.FeedingEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip + "，设置所有上料模块（T1~T5）为调试状态"); LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip + "，设置所有上料模块（T1~T5）为调试状态");
} }
else else
{ {
LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip); LogUtil.info("界面点击勾选：" + chbDisSL.Text + "=" + LineManager.DisSLEquip);
} }
List<int> rightHYs = new List<int>() { 101, 102, 103, 104, 105 };
foreach (int id in rightHYs)
{
bool isD = LineManager.DisSLEquip ? true : LineManager.Line.FeedingEquipMap[id].Config.IsDebug.Equals(1);
LineManager.Line.FeedingEquipMap[id].IsDebug = isD;
}
} }
private void checkBox1_CheckedChanged(object sender, EventArgs e) private void checkBox1_CheckedChanged(object sender, EventArgs e)
...@@ -1194,16 +1197,17 @@ namespace OnlineStore.AssemblyLine ...@@ -1194,16 +1197,17 @@ namespace OnlineStore.AssemblyLine
LineManager.DisAllHy = chbDisHy.Checked; LineManager.DisAllHy = chbDisHy.Checked;
if (LineManager.DisAllHy) if (LineManager.DisAllHy)
{ {
foreach (int id in LineManager.Line.HYEquipMap.Keys)
{
LineManager.Line.HYEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy + "，设置所有HY为调试状态"); LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy + "，设置所有HY为调试状态");
} }
else else
{ {
LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy); LogUtil.info("界面点击勾选：" + chbDisHy.Text + "=" + LineManager.DisAllHy);
} }
foreach (int id in LineManager.Line.HYEquipMap.Keys)
{
bool isD = LineManager.DisAllHy ? true : LineManager.Line.HYEquipMap[id].Config.IsDebug.Equals(1);
LineManager.Line.HYEquipMap[id].IsDebug = isD;
}
} }
private void chbDisMove_CheckedChanged(object sender, EventArgs e) private void chbDisMove_CheckedChanged(object sender, EventArgs e)
...@@ -1219,16 +1223,31 @@ namespace OnlineStore.AssemblyLine ...@@ -1219,16 +1223,31 @@ namespace OnlineStore.AssemblyLine
LineManager.DisAllMove = chbDisMove.Checked; LineManager.DisAllMove = chbDisMove.Checked;
if (LineManager.DisAllMove) if (LineManager.DisAllMove)
{ {
foreach (int id in LineManager.Line.MoveEquipMap.Keys)
{
LineManager.Line.MoveEquipMap[id].IsDebug = true;
}
LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove + "，设置所有进仓为调试状态"); LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove + "，设置所有进仓为调试状态");
} }
else else
{ {
LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove); LogUtil.info("界面点击勾选：" + chbDisMove.Text + "=" + LineManager.DisAllMove);
} }
foreach (int id in LineManager.Line.MoveEquipMap.Keys)
{
bool isD = LineManager.DisAllMove ? true : LineManager.Line.MoveEquipMap[id].Config.IsDebug.Equals(1);
LineManager.Line.MoveEquipMap[id].IsDebug = isD;
}
}
private void chbTrayTest_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.TrayToOutLineTest.Equals(chbTrayTest.Checked))
{
return;
}
LineManager.TrayToOutLineTest = chbTrayTest.Checked;
LogUtil.info("界面点击勾选：" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest);
} }
} }
} }
source/AssemblyLineClient/记录.txt
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
上料模块，顶升气缸升降时，出口顶升气缸同时动作。 上料模块，顶升气缸升降时，出口顶升气缸同时动作。
上料机构，入料横移到放料端时，再检测料盘宽度
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -454,12 +454,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -454,12 +454,8 @@ namespace OnlineStore.DeviceLibrary
OutLog("送出料串： " + MoveInfo.SLog + "， 线体横移电机运转，等待料架离开定位工位"); OutLog("送出料串： " + MoveInfo.SLog + "， 线体横移电机运转，等待料架离开定位工位");
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH);
if (Config.DOList.ContainsKey(IO_Type.SL_RollerLine_Run))
{
IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.HIGH);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.LOW));
} }
else if (MoveInfo.IsStep(LineMoveStep.FO_57_SideWayLineRun)) else if (MoveInfo.IsStep(LineMoveStep.FO_57_SideWayLineRun))
{ {
...@@ -467,10 +463,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -467,10 +463,7 @@ namespace OnlineStore.DeviceLibrary
OutLog("送出料串：" + MoveInfo.SLog + "， 线体横移电机运转，等待料架到达出口"); OutLog("送出料串：" + MoveInfo.SLog + "， 线体横移电机运转，等待料架到达出口");
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH);
if (Config.DOList.ContainsKey(IO_Type.SL_RollerLine_Run))
{
IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.HIGH);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(LineMoveStep.FO_58_WaitShelfGo)) else if (MoveInfo.IsStep(LineMoveStep.FO_58_WaitShelfGo))
...@@ -479,10 +472,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -479,10 +472,7 @@ namespace OnlineStore.DeviceLibrary
OutLog("送出料串： " + MoveInfo.SLog + "， 料架到达出口，线体横移电机停止 "); OutLog("送出料串： " + MoveInfo.SLog + "， 料架到达出口，线体横移电机停止 ");
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
if (Config.DOList.ContainsKey(IO_Type.SL_RollerLine_Run))
{
IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.LOW); IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.LOW);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
...@@ -497,9 +487,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -497,9 +487,31 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.FO_60_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.FO_60_TopDown))
{ {
if (HasOutLine)
{
MoveInfo.NextMoveStep(LineMoveStep.FO_61_OutLineRun);
OutLog("送出料串： " + MoveInfo.SLog + "， 出料线阻挡上升，出料线体转动5秒钟 或等待出料口信号亮");
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
if (IOValue(IO_Type.SL_OutLine_Check).Equals(IO_VALUE.LOW))
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH));
}
}
else
{
MoveEndS();
OutLog("送出料串： " + MoveInfo.SLog + "， 料架到达出口处, 通知AGV取空料架, 出料结束");
AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, Asa.ClientLevel.High);
}
}
else if (MoveInfo.IsStep(LineMoveStep.FO_61_OutLineRun))
{
MoveEndS(); MoveEndS();
// MoveInfo.NextMoveStep(LineMoveStep.FO_39_OutLineRun); OutLog("送出料串： " + MoveInfo.SLog + "， 出料线体停止，料架到达出口处, 通知AGV取空料架, 出料结束");
OutLog("送出料串： " + MoveInfo.SLog + "， 出口线体运转，料架到达出口处, 通知AGV取空料架, 出料结束"); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, Asa.ClientLevel.High); AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, Asa.ClientLevel.High);
} }
else if (MoveInfo.MoveStep >= LineMoveStep.FO_21_AxisDownMove && MoveInfo.MoveStep < LineMoveStep.FO_51_BatchAxisToP2) else if (MoveInfo.MoveStep >= LineMoveStep.FO_21_AxisDownMove && MoveInfo.MoveStep < LineMoveStep.FO_51_BatchAxisToP2)
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -801,7 +801,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -801,7 +801,12 @@ namespace OnlineStore.DeviceLibrary
//测线满时不需要横移 //测线满时不需要横移
if (IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
{ {
if (LineManager.TrayToOutLineTest)
{
MoveInfo.MoveParam = new InOutParam(trayNum);
LogInfo(" 托盘需要横移到出料线：托盘横移到出料线测试功能打开" );
return true;
}
//TODO //TODO
TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum); TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum);
if (!trayInfo.IsFull) if (!trayInfo.IsFull)
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -122,22 +122,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -122,22 +122,29 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸上升 "); CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸上升 ");
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
LineRun(SecondMoveInfo); //LineRun(SecondMoveInfo);
} }
else else
{ {
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸下降 "); CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸下降 ");
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
LineRun(SecondMoveInfo); //LineRun(SecondMoveInfo);
} }
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_02_TopMove)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_02_TopMove))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_03_StopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_03_StopDown);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡下降,电机正转");
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200); IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
if (IsNgPro())
{
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡下降,横移电机正转");
LineRun(SecondMoveInfo); LineRun(SecondMoveInfo);
} }
else
{
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡下降");
}
}
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_03_StopDown)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_03_StopDown))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_04_WaitTray); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_04_WaitTray);
...@@ -155,7 +162,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,7 +162,6 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_05_TrayCheck)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_05_TrayCheck))
{ {
//读取托盘号 //读取托盘号
LineStop();
UpdateTrayNum(); UpdateTrayNum();
if (ReelNeedMove()) if (ReelNeedMove())
{ {
...@@ -233,7 +239,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -233,7 +239,8 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降"); CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降，横移电机 停止");
LineStop(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
...@@ -251,15 +258,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -251,15 +258,17 @@ namespace OnlineStore.DeviceLibrary
private void JHY_11_TopDown() private void JHY_11_TopDown()
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：横移电机停止，阻挡上升，顶升气缸下降");
LineStop(SecondMoveInfo);
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
if (IsNgPro()) if (IsNgPro())
{ {
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：横移电机停止，阻挡上升，顶升气缸下降");
LineStop(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
} }
else else
{ {
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：启动横移电机，阻挡上升，顶升气缸上升");
LineRun(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
} }
} }
...@@ -279,7 +288,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -279,7 +288,6 @@ namespace OnlineStore.DeviceLibrary
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_07_TopUp); 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); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
} }
else else
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary
T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升"); T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升");
Update_T3C1_TrayNum(); Update_T3C1_TrayNum();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW)); T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopDown, IO_VALUE.LOW));
IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW);
T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_StopDown, IO_VALUE.LOW)); T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_StopDown, IO_VALUE.LOW));
} }
...@@ -118,7 +118,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -118,7 +118,7 @@ namespace OnlineStore.DeviceLibrary
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down); T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
T3C1_Log(" 托盘检测：" + T3C1_MoveInfo.SLog + "，检测到HY_FrontStopCheck，前阻挡下降 ， 等待 HY_FrontStopCheck=0，清理托盘RFID"); T3C1_Log(" 托盘检测：" + T3C1_MoveInfo.SLog + "，检测到HY_FrontStopCheck，前阻挡下降 ， 等待 HY_FrontStopCheck=0，清理托盘RFID");
T3C1_TrayNum = 0; T3C1_TrayNum = 0;
IOMove(IO_Type.HY_FrontStopCheck, IO_VALUE.HIGH, 1200); IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
T3C1_MoveInfo.OneWaitCanEndStep = true; T3C1_MoveInfo.OneWaitCanEndStep = true;
T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW)); T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW));
T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH)); T3C1_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -20,6 +20,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -20,6 +20,7 @@ namespace OnlineStore.DeviceLibrary
public static bool DisSLEquip = false; public static bool DisSLEquip = false;
public static bool DisAllHy = false; public static bool DisAllHy = false;
public static bool DisAllMove = false; public static bool DisAllMove = false;
public static bool TrayToOutLineTest = false;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
......
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
...@@ -33,11 +33,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -33,11 +33,12 @@ namespace OnlineStore.DeviceLibrary
{ {
if (ioType.Equals(IO_Type.HY_FrontStopDown) || ioType.Equals(IO_Type.HY_OL_StopDown)) if (ioType.Equals(IO_Type.HY_FrontStopDown) || ioType.Equals(IO_Type.HY_OL_StopDown))
{ {
} }
else if (ioType.Equals(IO_Type.HY_FrontStopCheck) || ioType.Equals(IO_Type.HY_OL_Tray_Check)) else if (ioType.Equals(IO_Type.HY_FrontStopCheck) || ioType.Equals(IO_Type.HY_OL_Tray_Check))
{ {
}
else if ( ioType.Equals(IO_Type.SL_RollerLine_Run)|| ioType.Equals(IO_Type.SL_OutLine_Run) || ioType.Equals(IO_Type.SL_OutLine_Check))
{
} }
else else
{ {
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -553,31 +553,32 @@ namespace OnlineStore.DeviceLibrary ...@@ -553,31 +553,32 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
FI_24_UpdownToP1, FI_24_UpdownToP1,
/// <summary> /// <summary>
/// 料盘移栽：等待没有伺服料盘检测信号 /// 料盘移栽：等待没有伺服料盘检测信号，等待检测到料盘
/// </summary> /// </summary>
FI_25_CheckTray, FI_25_CheckTray,
/// <summary> /// <summary>
/// 料盘移栽：批量轴到P3点，检测是否有料盘 /// 料盘移栽：批量轴到P3点
/// </summary> /// </summary>
FI_26_BatchAxisToP3, FI_26_BatchAxisToP3,
/// <summary> /// <summary>
/// 料盘移栽：记录高度尺寸 /// 料盘移栽： 上料横移气缸放料SOL
/// </summary> /// </summary>
FI_27_SaveSize, FI_27_CylinderGive,
/// <summary> /// <summary>
/// 料盘移栽： 上料横移气缸放料SOL /// 料盘移栽：记录高度尺寸
/// </summary> /// </summary>
FI_28_CylinderGive, FI_28_SaveSize,
/// <summary> /// <summary>
/// 提升轴下降到料盘不溢出的位置 /// 提升轴下降到料盘不溢出的位置
/// </summary> /// </summary>
FI_29_BatchAxisDown, FI_29_BatchAxisDown,
/// <summary> ///// <summary>
/// 等待料盘检测信号 ///// 等待料盘检测信号
/// </summary> ///// </summary>
FI_30_WaitReelCheck, //FI_30_WaitReelCheck,
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!