Skip to content

李娜 / SO664-AssemblyLine

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

接驳台bug修改

1 个父辈 126a4466
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 72 行增加 和 57 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -117,10 +117,15 @@ namespace OnlineStore.AssemblyLine ...@@ -117,10 +117,15 @@ namespace OnlineStore.AssemblyLine
if (cmbBoxIndex.Items.Count > 0) if (cmbBoxIndex.Items.Count > 0)
{ {
cmbBoxIndex.SelectedIndex = 0; cmbBoxIndex.SelectedIndex = 0;
} }
string opStr = "双击进入详情界面";
lblOpText.Text = opStr;
lblOpText2.Text = opStr;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
this.Opacity = 100; this.Opacity = 100;
LoadOk = true; LoadOk = true;
} }
private void AddForm(string text, Form form) private void AddForm(string text, Form form)
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.lblBox = new System.Windows.Forms.Label(); this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel(); this.panName = new System.Windows.Forms.Panel();
this.lblWarn = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -128,7 +129,7 @@ ...@@ -128,7 +129,7 @@
this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBox.ForeColor = System.Drawing.Color.Black; this.lblBox.ForeColor = System.Drawing.Color.Black;
this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.Location = new System.Drawing.Point(2, 73); this.lblBox.Location = new System.Drawing.Point(2, 94);
this.lblBox.Name = "lblBox"; this.lblBox.Name = "lblBox";
this.lblBox.Size = new System.Drawing.Size(245, 24); this.lblBox.Size = new System.Drawing.Size(245, 24);
this.lblBox.TabIndex = 6; this.lblBox.TabIndex = 6;
...@@ -151,6 +152,20 @@ ...@@ -151,6 +152,20 @@
this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick); this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick);
this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter); this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter);
// //
// lblWarn
//
this.lblWarn.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| 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.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 = "暂无报警";
//
// EquipControl // EquipControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -162,8 +177,9 @@ ...@@ -162,8 +177,9 @@
this.Controls.Add(this.lblMoveInfo); this.Controls.Add(this.lblMoveInfo);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblTrayNum); this.Controls.Add(this.lblTrayNum);
this.Controls.Add(this.lblWarn);
this.Name = "EquipControl"; this.Name = "EquipControl";
this.Size = new System.Drawing.Size(250, 100); this.Size = new System.Drawing.Size(250, 121);
this.Load += new System.EventHandler(this.EquipControl_Load); this.Load += new System.EventHandler(this.EquipControl_Load);
this.panName.ResumeLayout(false); this.panName.ResumeLayout(false);
this.panName.PerformLayout(); this.panName.PerformLayout();
...@@ -182,5 +198,6 @@ ...@@ -182,5 +198,6 @@
private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.Label lblBox; private System.Windows.Forms.Label lblBox;
private System.Windows.Forms.Panel panName; private System.Windows.Forms.Panel panName;
private System.Windows.Forms.Label lblWarn;
} }
} }
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -82,6 +82,7 @@ namespace OnlineStore.AssemblyLine ...@@ -82,6 +82,7 @@ namespace OnlineStore.AssemblyLine
lblStatus.Text = equip.GetRunStr(); lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔"); lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
lblWarn.Text = equip.WarnMsg;
if (equip.DeviceID < 100) if (equip.DeviceID < 100)
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
...@@ -92,7 +93,7 @@ namespace OnlineStore.AssemblyLine ...@@ -92,7 +93,7 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "出库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "出库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
...@@ -138,7 +139,7 @@ namespace OnlineStore.AssemblyLine ...@@ -138,7 +139,7 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "料架"+equip.CurrShelfId+"，出库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "料架"+equip.CurrShelfId+"，出库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
...@@ -153,11 +154,11 @@ namespace OnlineStore.AssemblyLine ...@@ -153,11 +154,11 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]送料：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]送料：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.MoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.MoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -139,7 +139,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -139,7 +139,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
if (SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
FixtureProcess(); FixtureProcess();
} }
...@@ -151,7 +151,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -151,7 +151,7 @@ namespace OnlineStore.DeviceLibrary
{ {
OutStoreProcess(); OutStoreProcess();
} }
else if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome)) else if (MoveInfo.MoveType.Equals(LineMoveType.RHome))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//托盘卡的信号不报警，只提示 //托盘卡的信号不报警，只提示
// [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒 // [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒
if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) && if (moveInfo.MoveType.Equals(LineMoveType.Fixture) &&
(moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) || (moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) ||
moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) || moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) ||
moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check))) moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check)))
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -63,7 +63,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -63,7 +63,7 @@ namespace OnlineStore.DeviceLibrary
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
LogInfo("开始原点返回： "); LogInfo("开始原点返回： ");
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -34,7 +34,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -34,7 +34,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary
if (CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
//托盘在工位阻挡处 //托盘在工位阻挡处
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp); MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升"); LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升");
...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown); MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘 ，前阻挡下降，清理托盘RFID，顶升气缸下降"); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘 ，前阻挡下降，清理托盘RFID，顶升气缸下降");
...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY71_OL_Wait); MoveInfo.NextMoveStep(LineMoveStep.HY71_OL_Wait);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 "); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 ");
...@@ -398,7 +398,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -398,7 +398,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) ");
hyout.MoveInfo.NewMove(LineMoveType.CheckFixture); hyout.MoveInfo.NewMove(LineMoveType.Fixture);
hyout.runStatus = LineRunStatus.Busy; hyout.runStatus = LineRunStatus.Busy;
hyout.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); hyout.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待" + hyout.Name + "可以横移超时"); ClearTimeoutAlarm("等待" + hyout.Name + "可以横移超时");
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
if (Config.IsSideWayIn) if (Config.IsSideWayIn)
{ {
...@@ -231,7 +231,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -231,7 +231,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown); MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID"); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) ");
hyOut.MoveInfo.NewMove(LineMoveType.CheckFixture); hyOut.MoveInfo.NewMove(LineMoveType.Fixture);
hyOut.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); hyOut.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时"); ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时");
} }
...@@ -587,14 +587,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -587,14 +587,14 @@ namespace OnlineStore.DeviceLibrary
{ {
if (Config.IsSideWayIn) if (Config.IsSideWayIn)
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel)) if (MoveInfo.MoveType.Equals(LineMoveType.Fixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel))
{ {
return true; return true;
} }
} }
else else
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY59_SL_WaitProcessReel)) if (MoveInfo.MoveType.Equals(LineMoveType.Fixture) && MoveInfo.IsStep(LineMoveStep.HY59_SL_WaitProcessReel))
{ {
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
...@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -173,17 +173,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,17 +173,13 @@ namespace OnlineStore.DeviceLibrary
} }
IOTimeOutProcess(); IOTimeOutProcess();
BusyMoveProcess(); BusyMoveProcess();
if (MoveInfo.MoveType.Equals(LineMoveType.None) && (!MoveStop)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.None) && (!MoveStop))
{ {
if (LineManager.Line.OutHyCanProLine()) if (LineManager.Line.OutHyCanProLine())
{ {
CheckFixture(); CheckFixture();
} }
} }
} }
} }
} }
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckLowWait.Stop(); trayCheckLowWait.Stop();
if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_05_TrayCheck); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_05_TrayCheck);
CheckLog("接驳台托盘" + SecondMoveInfo.SLog + "前阻挡上升，等待托盘到位 "); CheckLog("接驳台托盘" + SecondMoveInfo.SLog + "前阻挡上升，等待托盘到位 ");
...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheckLowWait.Stop(); trayCheckLowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘"); CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
...@@ -228,9 +228,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -228,9 +228,9 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown);
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);
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
...@@ -27,7 +27,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,7 +27,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
MoveInfo.NextMoveStep(LineMoveStep.OHY01_LongLCheck); MoveInfo.NextMoveStep(LineMoveStep.OHY01_LongLCheck);
LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，长线阻挡检测到托盘"); LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，长线阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
MoveInfo.NextMoveStep(LineMoveStep.OHY11_ShortLCheck); MoveInfo.NextMoveStep(LineMoveStep.OHY11_ShortLCheck);
LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，短线阻挡检测到托盘"); LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，短线阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -299,7 +299,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -299,7 +299,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//如果移栽已拦截到自己入库的托盘，不能出库 //如果移栽已拦截到自己入库的托盘，不能出库
if(move.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)&& if(move.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture)&&
move.SecondMoveInfo.MoveStep>=LineMoveStep.MIO_05_WaitTime && move.SecondMoveInfo.MoveStep>=LineMoveStep.MIO_05_WaitTime &&
move.SecondMoveInfo.MoveStep<= LineMoveStep.MO_14_TopDown move.SecondMoveInfo.MoveStep<= LineMoveStep.MO_14_TopDown
) )
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if ( CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if ( CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
T3C1_MoveInfo.NewMove(LineMoveType.CheckFixture); T3C1_MoveInfo.NewMove(LineMoveType.Fixture);
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp); T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp);
T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升"); T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升");
...@@ -114,7 +114,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -114,7 +114,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
T3C1_MoveInfo.NewMove(LineMoveType.CheckFixture); T3C1_MoveInfo.NewMove(LineMoveType.Fixture);
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;
...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary
internal bool T3C1TrayIsReady() internal bool T3C1TrayIsReady()
{ {
if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember)) if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.Fixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember))
{ {
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.EndMove(); SecondMoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
LogInfo("开始 原点返回： 升降轴回原点，阻挡气缸上升 "); LogInfo("开始 原点返回： 升降轴回原点，阻挡气缸上升 ");
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
// 减去需要的盘数 // 减去需要的盘数
// TrayManager.DelNeedEmptyTrayNum(); // TrayManager.DelNeedEmptyTrayNum();
OutLog("出库 ：移栽完成，放行托盘"); OutLog("出库 ：移栽完成，放行托盘");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
...@@ -647,7 +647,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -647,7 +647,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）"); CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）");
...@@ -665,7 +665,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -665,7 +665,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0，清理托盘RFID"); CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0，清理托盘RFID");
ClearTrayRFID(); ClearTrayRFID();
...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (DeviceID.Equals(5)) if (DeviceID.Equals(5))
{ {
if (SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && SecondMoveInfo.MoveStep <= LineMoveStep.MIO_04_Wait) if (SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture) && SecondMoveInfo.MoveStep <= LineMoveStep.MIO_04_Wait)
{ {
UpdateTrayNum(); UpdateTrayNum();
LogUtil.info(Name + " EndProcessTray ,结束当前托盘[" + currTrayNum + "]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 "); LogUtil.info(Name + " EndProcessTray ,结束当前托盘[" + currTrayNum + "]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 ");
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreProcess(); OutStoreProcess();
isInPro = false; isInPro = false;
break; break;
case LineMoveType.ReturnHome: case LineMoveType.RHome:
ResetProcess(); ResetProcess();
isInPro = false; isInPro = false;
break; break;
...@@ -487,11 +487,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -487,11 +487,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public void IOMove(string IoType, IO_VALUE value, int msTime = 0) public void IOMove(string IoType, IO_VALUE value, int msTime = 0)
{ {
if (baseConfig.DType.Equals(DeviceType.HYEquip))
{
//需要判断是否包含此DO
}
if (msTime <= 0) if (msTime <= 0)
{ {
IOManager.IOMove(IoType, value, baseConfig.Id); IOManager.IOMove(IoType, value, baseConfig.Id);
......
source/DeviceLibrary/model/LineMoveInfo.cs
...@@ -542,7 +542,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -542,7 +542,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 原点返回 /// 原点返回
/// </summary> /// </summary>
ReturnHome = 3, RHome = 3,
/// <summary> /// <summary>
/// 重置 /// 重置
/// </summary> /// </summary>
...@@ -550,6 +550,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -550,6 +550,6 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 夹具检测处理 /// 夹具检测处理
/// </summary> /// </summary>
CheckFixture = 5, Fixture = 5,
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!