Commit ccc9f6e5 LN

1

1 个父辈 ac876e8f
......@@ -182,15 +182,15 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.DO_06_SeparateCheck);
Line3LastTrayP++;
LogInfo(hengyiName + "出口有料,等待料盘到达分盘装置位置,最多等待5000");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
LogInfo(hengyiName + "出口有料,等待料盘到达分盘装置位置,最多等待60000");
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(60000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Check, IO_VALUE.HIGH));
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_06_SeparateCheck))
{
MoveInfo.NextMoveStep(LineMoveStep.DO_07_CRun);
LogInfo(hengyiName + "出口有料,最多等待2000");
MoveInfo.OneWaitCanEndStep = true;
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
......
......@@ -565,11 +565,11 @@ namespace OnlineStore.DeviceLibrary
{
CheckHasTray();
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_11_MoveCylinder_Up))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_11_CylinderUp))
{
FI_12_MoveCylinder_Give();
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_12_MoveCylinder_Give))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_12_CylinderGive))
{
if (IOValue(IO_Type.SL_MoveCylinder_Give).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SL_MoveCylinder_Take).Equals(IO_VALUE.LOW))
{
......@@ -609,11 +609,11 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_13_ScanCode))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_14_MoveCylinder_Take);
MoveInfo.NextMoveStep(LineMoveStep.FI_14_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + ":上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_14_MoveCylinder_Take))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_14_CylinderTake))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_15_UpdownAxisToP3);
InLog("料盘移栽" + MoveInfo.SLog + ":升降轴到P3");
......@@ -621,11 +621,11 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_15_UpdownAxisToP3))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_16_MoveCylinder_Tighten);
MoveInfo.NextMoveStep(LineMoveStep.FI_16_CylinderTighten);
InLog("料盘移栽" + MoveInfo.SLog + ":上料横移机构夹紧");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Slack, IO_Type.SL_MoveCylinder_Tighten);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_16_MoveCylinder_Tighten))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_16_CylinderTighten))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_17_UpdownAxisToP1);
InLog("料盘移栽" + MoveInfo.SLog + ":升降伺服到P1点");
......@@ -671,7 +671,7 @@ namespace OnlineStore.DeviceLibrary
{
if (MoveCylineCanTakeOrGive())
{
MoveInfo.NextMoveStep(LineMoveStep.FI_19_MoveCylinder_Emptying);
MoveInfo.NextMoveStep(LineMoveStep.FI_19_CylinderGive);
InLog("料盘移栽" + MoveInfo.SLog + ":上料横移气缸放料SOL");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give);
}
......@@ -682,7 +682,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
}
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_19_MoveCylinder_Emptying))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_19_CylinderGive))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_20_WaitTray);
InLog("料盘移栽" + MoveInfo.SLog + ":等待空托盘到达");
......@@ -729,25 +729,25 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_UpdownAxisToP2))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_22_MoveCylinder_Down);
MoveInfo.NextMoveStep(LineMoveStep.FI_22_CylinderDown);
InLog("料盘移栽" + MoveInfo.SLog + ":上料机构下降,");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_MoveCylinder_Down))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_CylinderDown))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_23_MoveCylinder_Slack);
MoveInfo.NextMoveStep(LineMoveStep.FI_23_CylinderRelax);
InLog("料盘移栽" + MoveInfo.SLog + ":上料气缸放松");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Tighten, IO_Type.SL_MoveCylinder_Slack);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_23_MoveCylinder_Slack))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_23_CylinderRelax))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_24_MoveCylinder_Up);
MoveInfo.NextMoveStep(LineMoveStep.FI_24_CylinderUp);
InLog("料盘移栽" + MoveInfo.SLog + ":上料横移机构上升 ");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_MoveCylinder_Up))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_CylinderUp))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_25_UpDownAxisToP1);
InLog("料盘移栽" + MoveInfo.SLog + ":升降伺服到P1点");
......@@ -838,14 +838,14 @@ namespace OnlineStore.DeviceLibrary
{
if (MoveCylineCanTakeOrGive())
{
MoveInfo.NextMoveStep(LineMoveStep.FI_12_MoveCylinder_Give);
MoveInfo.NextMoveStep(LineMoveStep.FI_12_CylinderGive);
InLog("料盘移栽" + MoveInfo.SLog + ":上料机构检测到料盘,横移机构到放料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give);
}
else
{
//有料盘
MoveInfo.NextMoveStep(LineMoveStep.FI_11_MoveCylinder_Up);
MoveInfo.NextMoveStep(LineMoveStep.FI_11_CylinderUp);
InLog("料盘移栽" + MoveInfo.SLog + ":上料机构检测到料盘,横移机构上升");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
}
......@@ -1020,7 +1020,7 @@ namespace OnlineStore.DeviceLibrary
if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
//入料执行中, 且需要空托盘
if (MoveInfo.MoveStep >= LineMoveStep.FI_11_MoveCylinder_Up && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
{
if (NeedSaveParam)
{
......
......@@ -616,12 +616,12 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入料取料:横移机构先上升
/// </summary>
FI_11_MoveCylinder_Up=11011,
FI_11_CylinderUp=11011,
/// <summary>
/// 入料取料:上料机构到放料端
/// </summary>
FI_12_MoveCylinder_Give = 11012,
FI_12_CylinderGive = 11012,
/// <summary>
/// 入料检测到料盘:扫码
/// </summary>
......@@ -630,7 +630,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料盘移栽:有料盘:上料横移机构取料
/// </summary>
FI_14_MoveCylinder_Take = 11014,
FI_14_CylinderTake = 11014,
/// <summary>
/// 料盘移栽:升降轴到P3
......@@ -640,7 +640,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料盘移栽:上料横移机构夹紧
/// </summary>
FI_16_MoveCylinder_Tighten = 11016,
FI_16_CylinderTighten = 11016,
/// <summary>
/// 料盘移栽:上料横移机构上升,同时伺服运动到P3
/// </summary>
......@@ -657,7 +657,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料盘移栽: 上料横移气缸放料SOL
/// </summary>
FI_19_MoveCylinder_Emptying ,
FI_19_CylinderGive ,
/// <summary>
/// 料盘移栽:等待空托盘到达,并顶升上升,定位上升
/// </summary>
......@@ -669,16 +669,16 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料盘移栽: 上料机构下降
/// </summary>
FI_22_MoveCylinder_Down,
FI_22_CylinderDown,
/// <summary>
/// 料盘移栽: 上料气缸放松
/// </summary>
FI_23_MoveCylinder_Slack ,
FI_23_CylinderRelax ,
/// <summary>
/// 料盘移栽:上料横移机构上升
/// </summary>
FI_24_MoveCylinder_Up,
FI_24_CylinderUp,
/// <summary>
/// 料盘移栽:升降伺服到P1点
/// </summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!