Skip to content

李娜 / SO664-AssemblyLine

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

1

1 个父辈 9e37d75e
内嵌 并排
正在显示 9 个修改的文件 包含 53 行增加 和 41 行删除
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
......@@ -53,6 +53,8 @@
this.lblTrayNum.TabIndex = 0;
this.lblTrayNum.Text = "托盘号：";
this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTrayNum.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblTrayNum.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
// lblName
//
......@@ -84,6 +86,8 @@
this.lblStatus.TabIndex = 2;
this.lblStatus.Text = "暂未启动";
this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblStatus.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblStatus.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
// lblMoveInfo
//
......@@ -99,6 +103,8 @@
this.lblMoveInfo.TabIndex = 3;
this.lblMoveInfo.Text = "暂无出入库";
this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblMoveInfo.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblMoveInfo.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
// lblDebug
//
......@@ -106,11 +112,13 @@
this.lblDebug.AutoSize = true;
this.lblDebug.BackColor = System.Drawing.Color.Transparent;
this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDebug.Location = new System.Drawing.Point(179, 4);
this.lblDebug.Location = new System.Drawing.Point(183, 3);
this.lblDebug.Name = "lblDebug";
this.lblDebug.Size = new System.Drawing.Size(51, 20);
this.lblDebug.TabIndex = 5;
this.lblDebug.Text = "启用：";
this.lblDebug.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblDebug.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
// lblBox
//
......@@ -126,6 +134,7 @@
this.lblBox.TabIndex = 6;
this.lblBox.Text = "BOX状态：";
this.lblBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.MouseEnter += new System.EventHandler(this.lblBox_MouseEnter);
//
// panName
//
......
source/AssemblyLineClient/useControl/EquipControl.cs
......@@ -206,5 +206,20 @@ namespace OnlineStore.AssemblyLine
{
this.OnDoubleClick(e);
}
private void lblStatus_DoubleClick(object sender, EventArgs e)
{
this.OnDoubleClick(e);
}
private void lblStatus_MouseEnter(object sender, EventArgs e)
{
this.OnMouseEnter(e);
}
private void lblBox_MouseEnter(object sender, EventArgs e)
{
this.OnMouseEnter(e);
}
}
}
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -436,7 +436,7 @@ namespace OnlineStore.DeviceLibrary
CheckAlarmProcess(moveInfo, LineAlarmType.IoSingleTimeOut);
}
}
else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
{
preRWTime = DateTime.Now;
string msg = moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] " + NotOkMsg + "已等待 " + Math.Round(span.TotalSeconds, 1) + "秒，重写DO：";
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -307,7 +307,10 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
CheckAndMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
CheckAndMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
if (Config.DOList.ContainsKey(IO_Type.SL_RollerLine_Run))
{
IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.LOW);
}
CheckAndMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
CheckAndMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
CheckAndMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -1172,31 +1172,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
//private bool NeedEmptyTrayGo()
//{
// try
// {
// if (DeviceID.Equals(102))
// {
// MoveEquip moveEquip7 = LineManager.Line.MoveEquipMap[7];
// if (moveEquip7.IsWaitEmptyTray())
// {
// return true;
// }
// MoveEquip moveEquip8 = LineManager.Line.MoveEquipMap[8];
// if (moveEquip8.IsWaitEmptyTray())
// {
// return true;
// }
// }
// }
// catch (Exception ex)
// {
// LogUtil.error("NeedEmptyTrayGo出错：" + ex.ToString());
// }
// return false;
//}
#endregion
}
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
......@@ -443,6 +443,10 @@ namespace OnlineStore.DeviceLibrary
OutLog("送出料串： " + MoveInfo.SLog + "， 线体横移电机运转，等待料架离开定位工位");
IOMove(IO_Type.SL_LocationSideWay_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);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Location_Check, IO_VALUE.LOW));
}
......@@ -452,6 +456,10 @@ namespace OnlineStore.DeviceLibrary
OutLog("送出料串：" + MoveInfo.SLog + "， 线体横移电机运转，等待料架到达出口");
IOMove(IO_Type.SL_LocationSideWay_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);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.HIGH));
}
else if (MoveInfo.IsStep(LineMoveStep.FO_58_WaitShelfGo))
......@@ -459,7 +467,11 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.FO_59_LineStop);
OutLog("送出料串： " + MoveInfo.SLog + "， 料架到达出口，线体横移电机停止 ");
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);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
}
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -540,13 +540,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.TopCylinder_Up);
LocationCylinderDown(MoveInfo);
}
/// <summary>
/// 托盘是否需要取放料
/// </summary>
/// <param name="trayNum">托盘号</param>
/// <returns></returns>
private bool TrayNeedSL(int trayNum)
{
try
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -372,8 +372,8 @@ namespace OnlineStore.DeviceLibrary
trayNum = -1;
if (deviceID.Equals(103))
{
if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember))
{
if (T3C1TrayIsReady())
{
trayNum = T3C1_TrayNum;
return true;
}
......@@ -401,7 +401,7 @@ namespace OnlineStore.DeviceLibrary
{
if (deviceID.Equals(103))
{
MO_16_Stop2Down();
T3C1TrayCanLeave();
}
else
{
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
......@@ -312,8 +312,11 @@ namespace OnlineStore.DeviceLibrary
}
internal void T3C1TrayCanLeave()
{
MO_16_Stop2Down();
{
if (T3C1TrayIsReady())
{
MO_16_Stop2Down();
}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!