Skip to content

孙克 / RC1250-AssemblyLine

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

运动结束更新状态。出料loc-1时不分皮带线

1 个父辈 c3c5f862
内嵌 并排
正在显示 8 个修改的文件 包含 25 行增加 和 33 行删除
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -138,9 +138,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -138,9 +138,7 @@ namespace OnlineStore.DeviceLibrary
{ {
case LineMoveStep.DL_R_CylinderDown: case LineMoveStep.DL_R_CylinderDown:
LogInfo(MoveInfo.MoveType + "完成！"); LogInfo(MoveInfo.MoveType + "完成！");
runStatus = LineRunStatus.Runing; MoveEndS();
lineStatus = LineStatus.StoreOnline;
MoveInfo.EndMove();
SecondMoveInfo.EndMove(); SecondMoveInfo.EndMove();
break; break;
...@@ -424,6 +422,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -424,6 +422,7 @@ namespace OnlineStore.DeviceLibrary
msg += "LastTP："+ TrayLine1.LastTrayPosition+" " + TrayLine2.LastTrayPosition + " " + Line3LastTrayP + " " + "\n"; msg += "LastTP："+ TrayLine1.LastTrayPosition+" " + TrayLine2.LastTrayPosition + " " + Line3LastTrayP + " " + "\n";
msg += "LIsRun："+ TrayLine1.IsInTurn() + " " + TrayLine2.IsInTurn() + " " +Line3Turn.InTurn + " " +"\n"; msg += "LIsRun："+ TrayLine1.IsInTurn() + " " + TrayLine2.IsInTurn() + " " +Line3Turn.InTurn + " " +"\n";
msg += "L3CanRun："+ TrayLine1.Line3CanRun + " " + TrayLine2.Line3CanRun + " " + "\n"; msg += "L3CanRun："+ TrayLine1.Line3CanRun + " " + TrayLine2.Line3CanRun + " " + "\n";
msg += "LastWidth：" + LastWidth;
return msg; return msg;
} }
public override bool StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
......
source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs
...@@ -196,8 +196,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -196,8 +196,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_07_CRun)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_07_CRun))
{ {
runStatus = LineRunStatus.Runing; MoveEndS();
MoveInfo.EndMove();
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW); IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
LogInfo(hengyiName + "出口有料，送料结束，停止皮带线"); LogInfo(hengyiName + "出口有料，送料结束，停止皮带线");
} }
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -583,5 +583,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -583,5 +583,11 @@ namespace OnlineStore.DeviceLibrary
msg += "SMoveS：" + SecondMoveInfo.MoveStep + ""; msg += "SMoveS：" + SecondMoveInfo.MoveStep + "";
return msg; return msg;
} }
internal void MoveEndS()
{
lineStatus = LineStatus.StoreOnline;
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
}
} }
} }
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -269,9 +269,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,9 +269,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("重置完成，出口检测到有料架，调用 AgvClient.NeedLeave"); LogInfo("重置完成，出口检测到有料架，调用 AgvClient.NeedLeave");
AgvClient.NeedLeave(Config.AgvOutName); AgvClient.NeedLeave(Config.AgvOutName);
} }
runStatus = LineRunStatus.Runing; MoveEndS();
lineStatus = LineStatus.StoreOnline;
MoveInfo.EndMove();
break; break;
default: break; default: break;
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -471,8 +471,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -471,8 +471,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
LogUtil.info(" 未检测到料架，入料结束"); LogUtil.info(" 未检测到料架，入料结束");
} }
} }
...@@ -524,8 +523,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -524,8 +523,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
InLog(" 未检测到料架，入料结束"); InLog(" 未检测到料架，入料结束");
} }
} }
...@@ -823,8 +821,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -823,8 +821,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_39_TopDown)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_39_TopDown))
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
// MoveInfo.NextMoveStep(LineMoveStep.FI_39_OutLineRun); // MoveInfo.NextMoveStep(LineMoveStep.FI_39_OutLineRun);
InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束"); InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束");
AgvClient.NeedLeave(Config.AgvOutName); AgvClient.NeedLeave(Config.AgvOutName);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -155,8 +155,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,8 +155,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
OutLog(" 未检测到料架， 准备出库料架结束"); OutLog(" 未检测到料架， 准备出库料架结束");
} }
} }
...@@ -205,9 +204,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -205,9 +204,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
lineStatus = LineStatus.StoreOnline;
OutLog(" 未检测到料架，料架处理结束"); OutLog(" 未检测到料架，料架处理结束");
} }
} }
...@@ -338,8 +335,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -338,8 +335,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_38_TopDown)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_38_TopDown))
{ {
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
// MoveInfo.NextMoveStep(LineMoveStep.FO_39_OutLineRun); // MoveInfo.NextMoveStep(LineMoveStep.FO_39_OutLineRun);
OutLog("送出料串： " + MoveInfo.SLog + "， 出口线体运转，料架到达出口处, 通知AGV取空料架, 出料结束"); OutLog("送出料串： " + MoveInfo.SLog + "， 出口线体运转，料架到达出口处, 通知AGV取空料架, 出料结束");
AgvClient.NeedLeave(Config.AgvOutName); AgvClient.NeedLeave(Config.AgvOutName);
...@@ -510,8 +506,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -510,8 +506,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
OutLog("紧急出料完成，出料结束"); OutLog("紧急出料完成，出料结束");
MoveInfo.EndMove(); MoveEndS();
runStatus = LineRunStatus.Runing;
} }
} }
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -156,9 +156,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -156,9 +156,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
OutLog("出库处理结束！"); OutLog("出库处理结束！");
lineStatus = LineStatus.StoreOnline; MoveEndS();
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
} }
#endregion #endregion
...@@ -306,9 +304,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -306,9 +304,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_16_SendEnd)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_16_SendEnd))
{ {
LogInfo("入库【" + posId + "】处理（移栽）全部完成！"); LogInfo("入库【" + posId + "】处理（移栽）全部完成！");
runStatus = LineRunStatus.Runing; MoveEndS();
lineStatus = LineStatus.StoreOnline;
MoveInfo.EndMove();
} }
} }
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -106,7 +106,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -106,7 +106,11 @@ namespace OnlineStore.DeviceLibrary
//rfid: 分配的料架RFID //rfid: 分配的料架RFID
//rfidLoc: //rfidLoc:
//是否是小盘 //是否是小盘
if (inoup.smallReel) if (inoup.rfidLoc <= 0)
{
//-1时随意放
}
else if (inoup.smallReel)
{ {
if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72) if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72)
{ {
...@@ -484,9 +488,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -484,9 +488,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_CylinderAfter)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_CylinderAfter))
{ {
LogInfo("出料【" + posId + "】处理完成！"); LogInfo("出料【" + posId + "】处理完成！");
runStatus = LineRunStatus.Runing; MoveEndS();
lineStatus = LineStatus.StoreOnline;
MoveInfo.EndMove();
} }
} }
private OutTrayLineBean GetDisLine() private OutTrayLineBean GetDisLine()
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!