Skip to content

李娜 / SO664-AssemblyLine

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

入料bug修改

1 个父辈 f2ec5305
内嵌 并排
正在显示 4 个修改的文件 包含 29 行增加 和 6 行删除
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -27,7 +27,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,7 +27,14 @@ namespace OnlineStore.DeviceLibrary
baseConfig = config; baseConfig = config;
this.Config = config; this.Config = config;
IsDebug = config.IsDebug.Equals(1); IsDebug = config.IsDebug.Equals(1);
if (config.IsCanOut.Equals(1))
{
Name = (" " + "出料T" + DeviceID % 100 + " ").ToUpper();
}
else
{
Name = (" " + "入料T" + DeviceID % 100 + " ").ToUpper(); Name = (" " + "入料T" + DeviceID % 100 + " ").ToUpper();
}
Init(); Init();
UseAxis = true; UseAxis = true;
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -280,7 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -280,7 +280,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsStep(LineMoveStep.HY02_FrontStopDown)) if (MoveInfo.IsStep(LineMoveStep.HY02_FrontStopDown))
{ {
if (IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.LOW)|| IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.LOW) || IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp); MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 托盘检测到信号，前阻挡上升"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 托盘检测到信号，前阻挡上升");
...@@ -302,7 +302,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -302,7 +302,9 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY04_WaitTime); MoveInfo.NextMoveStep(LineMoveStep.HY04_WaitTime);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 再次等待托盘信号"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 再次等待托盘信号");
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
} }
else else
{ {
...@@ -313,6 +315,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -313,6 +315,8 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime)) else if (MoveInfo.IsStep(LineMoveStep.HY04_WaitTime))
{ {
if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
{
//更新托盘号 //更新托盘号
UpdateTrayNum(); UpdateTrayNum();
...@@ -329,6 +333,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -329,6 +333,13 @@ namespace OnlineStore.DeviceLibrary
{ {
HY11_TopUpToHY(); HY11_TopUpToHY();
} }
}
else
{
//未检测到信号或阻挡下降失败，结束处理
LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
MoveInfo.EndMove();
}
} }
else if (MoveInfo.IsStep(LineMoveStep.HY06_SL_TopUp)) else if (MoveInfo.IsStep(LineMoveStep.HY06_SL_TopUp))
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -567,6 +567,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -567,6 +567,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + MoveInfo.SLog + logName + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]"); LogUtil.info(Name + MoveInfo.SLog + logName + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]");
string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code); string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
} }
else if (MoveInfo.IsStep(LineMoveStep.JM_16_ReelArrive)) else if (MoveInfo.IsStep(LineMoveStep.JM_16_ReelArrive))
{ {
...@@ -580,6 +581,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -580,6 +581,7 @@ namespace OnlineStore.DeviceLibrary
{ {
ClearTimeoutAlarm("给服务器发送afterPutCutTask完成"); ClearTimeoutAlarm("给服务器发送afterPutCutTask完成");
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
OutLog(logName + MoveInfo.SLog + "：结束 "); OutLog(logName + MoveInfo.SLog + "：结束 ");
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
...@@ -244,9 +244,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -244,9 +244,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown); MO_14_TopDown();
T3C1_Log("托盘检测" + T3C1_MoveInfo.SLog + " ，托盘号【" + T3C1_TrayNum + "】,直接放盘通过，顶升气缸下降 ");
CylinderMove(T3C1_MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
} }
} }
...@@ -288,7 +286,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -288,7 +286,12 @@ namespace OnlineStore.DeviceLibrary
} }
#endregion #endregion
} }
private void MO_14_TopDown()
{
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
T3C1_Log("托盘检测" + T3C1_MoveInfo.SLog + " ，托盘号【" + T3C1_TrayNum + "】,直接放盘通过，顶升气缸下降 ");
CylinderMove(T3C1_MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
private void MO_16_Stop2Down() private void MO_16_Stop2Down()
{ {
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down); T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
...@@ -342,7 +345,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -342,7 +345,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (T3C1TrayIsReady()) if (T3C1TrayIsReady())
{ {
MO_16_Stop2Down(); MO_14_TopDown();
} }
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!