Skip to content

李娜 / SO827-AssemblyLine

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

灯定义修改。托盘等待入库超时时放行。

1 个父辈 37543ebb
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 28 行增加 和 19 行删除
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -477,9 +477,9 @@ ...@@ -477,9 +477,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, 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(199, 126); this.lblThisSta.Location = new System.Drawing.Point(244, 126);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(769, 28); this.lblThisSta.Size = new System.Drawing.Size(724, 28);
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;
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(14, 47); this.lblMoveInfo.Location = new System.Drawing.Point(5, 44);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17); this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280; this.lblMoveInfo.TabIndex = 280;
...@@ -608,9 +608,9 @@ ...@@ -608,9 +608,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(199, 44); this.lblInstoreList.Location = new System.Drawing.Point(244, 44);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(769, 77); this.lblInstoreList.Size = new System.Drawing.Size(724, 77);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage2 // tabPage2
...@@ -791,7 +791,7 @@ ...@@ -791,7 +791,7 @@
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(49, 17); this.label3.Size = new System.Drawing.Size(49, 17);
this.label3.TabIndex = 321; this.label3.TabIndex = 321;
this.label3.Text = "P3位置:"; this.label3.Text = "P2位置:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtDP2 // txtDP2
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -457,10 +457,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -457,10 +457,10 @@ namespace OnlineStore.DeviceLibrary
} }
else if (LastWidth.Equals(13)) else if (LastWidth.Equals(13))
{ {
if (LastHeight < 28) if (LastHeight < 16)
{ {
LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，13寸盘默认盘高最低=28，修改高度为28"); LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，13寸盘默认盘高最低=16，修改高度为16");
LastHeight = 28; LastHeight = 16;
} }
else if (LastHeight > 36) else if (LastHeight > 36)
{ {
...@@ -470,10 +470,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -470,10 +470,10 @@ namespace OnlineStore.DeviceLibrary
} }
else if (LastWidth.Equals(15)) else if (LastWidth.Equals(15))
{ {
if (LastHeight < 28) if (LastHeight < 16)
{ {
LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，15寸盘默认盘高最低=28，修改高度为28"); LogUtil.error(Name + "计算后高度" + LastWidth + "X" + LastHeight + "，15寸盘默认盘高最低=16，修改高度为16");
LastHeight = 28; LastHeight = 16;
} }
else if (LastHeight > 48) else if (LastHeight > 48)
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -1021,13 +1021,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -1021,13 +1021,22 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.MIO_08_WaitInStore) && else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_08_WaitInStore))
MoveInfo.MoveType.Equals(LineMoveType.None)&&
runStatus.Equals(LineRunStatus.Runing))
{ {
StartInStoreMove(SecondMoveInfo.MoveParam); if (MoveInfo.MoveType.Equals(LineMoveType.None))
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，等待移栽完成后放开阻挡）"); {
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_09_WaitTrayCanGo); StartInStoreMove(SecondMoveInfo.MoveParam);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，等待移栽完成后放开阻挡）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_09_WaitTrayCanGo);
}
else if (SecondMoveInfo.IsTimeOut(30))
{
WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待开始入库超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg + "，暂时放托盘离开");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 入库超时，放托盘离开，顶升气缸1下降");
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
}
} }
#endregion #endregion
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -252,7 +252,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -252,7 +252,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private static List<int> trayHeightList = new List<int>() { 8, 12, 28, 36, 48 }; private static List<int> trayHeightList = new List<int>() { 8, 12, 16, 20, 24, 28, 36, 48 };
public static List<int> GetTrayList() public static List<int> GetTrayList()
{ {
return trayHeightList; return trayHeightList;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!