Skip to content

孙克 / RC1250-AssemblyLine

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

AIO的dll更新,托盘处理修改

1 个父辈 2411414f
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 27 行增加 和 8 行删除
dll/Asa.IOModule.AIOBOX.xml
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Close"> <member name="M:Asa.IOModule.AIOBOX.Close">
<summary> <summary>
......
source/AssemblyLineClient/记录.txt
...@@ -156,6 +156,12 @@ agv客户端启动时需要设置状态为none ...@@ -156,6 +156,12 @@ agv客户端启动时需要设置状态为none
横移机构优化，上一个托盘准备离开时，下一个托盘就可以进入。 横移机构优化，上一个托盘准备离开时，下一个托盘就可以进入。
20200227
AIO的dll更新，增加重连功能。
托盘横移过程中，提前下降第一个横移顶升。
上料模块，只有料盘到达流水线上方后才拦截托盘。
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -716,7 +716,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -716,7 +716,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, param, "扫码失败"); TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, param, "扫码失败");
} }
//从服务器获取库位号 //从服务器获取库位号
string result = SServerManager.CodeReceived(Name, currTrayNum, LastCodeList, LastHeight, LastWidth,CurrShelfId); string result = SServerManager.CodeReceived(Name, currTrayNum, LastCodeList, LastHeight, LastWidth,CurrShelfId,DeviceID);
if (!result.Equals("")) if (!result.Equals(""))
{ {
InOutParam param = new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, true); InOutParam param = new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, true);
...@@ -1086,7 +1086,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1086,7 +1086,8 @@ namespace OnlineStore.DeviceLibrary
if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
{ {
//入料执行中， 且需要空托盘 //入料执行中， 且需要空托盘
if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray) if (MoveInfo.MoveStep >= LineMoveStep.FI_20_WaitTray && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
//if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
{ {
if (NeedSaveParam) if (NeedSaveParam)
{ {
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -284,9 +284,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,9 +284,10 @@ namespace OnlineStore.DeviceLibrary
} }
if (sidesWayNum.Equals(2)) if (sidesWayNum.Equals(2))
{ {
LineMoveInfo moveInfo = FeedingEquipMap[104].SecondMoveInfo;
if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None)) if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
LineMoveInfo moveInfo = FeedingEquipMap[104].SecondMoveInfo;
if (moveInfo.MoveType.Equals(LineMoveType.None)) if (moveInfo.MoveType.Equals(LineMoveType.None))
{ {
return true; return true;
...@@ -297,6 +298,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -297,6 +298,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return true; return true;
} }
} else if (SW23_MoveInfo.MoveStep .Equals( LineMoveStep.SW12_WaitTrayGo)
&& moveInfo.MoveType.Equals(LineMoveType.None))
{
return true;
} }
} }
else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait) else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait)
...@@ -307,9 +312,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -307,9 +312,10 @@ namespace OnlineStore.DeviceLibrary
if (sidesWayNum.Equals(4)) if (sidesWayNum.Equals(4))
{ {
LineMoveInfo moveInfo = FeedingEquipMap[101].SecondMoveInfo;
if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None)) if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
LineMoveInfo moveInfo = FeedingEquipMap[101].SecondMoveInfo;
if (moveInfo.MoveType.Equals(LineMoveType.None)) if (moveInfo.MoveType.Equals(LineMoveType.None))
{ {
return true; return true;
...@@ -321,6 +327,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -321,6 +327,11 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
} }
} }
else if (SW41_MoveInfo.Equals( LineMoveStep.SW12_WaitTrayGo)
&& moveInfo.MoveType.Equals(LineMoveType.None))
{
return true;
}
} }
else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait) else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait)
{ {
...@@ -591,7 +602,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -591,7 +602,8 @@ namespace OnlineStore.DeviceLibrary
else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove)) else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove))
{ {
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck); SW41_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck);
SWLog("横移轨道41：等待托盘到达出口 "); SWLog("横移轨道41：收到SW1_TrayCheck，先顶升4下降，等待托盘到达出口 ");
CylinderMove(null, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW1_TrayCheck, IO_VALUE.HIGH)); SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW1_TrayCheck, IO_VALUE.HIGH));
} }
...@@ -748,7 +760,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -748,7 +760,8 @@ namespace OnlineStore.DeviceLibrary
else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove)) else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove))
{ {
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck); SW23_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck);
SWLog("横移轨道23：等待托盘到达出口 "); SWLog("横移轨道23：收到 SW3_TrayCheck，先顶升2下降，,等待托盘到达出口 ");
CylinderMove(null, IO_Type.SW2_TopCylinder_Up, IO_Type.SW2_TopCylinder_Down);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW3_TrayCheck, IO_VALUE.HIGH)); SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW3_TrayCheck, IO_VALUE.HIGH));
} }
......
source/DeviceLibrary/server/LineServer.cs
...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
{ {
IdList.Add(i); IdList.Add(i);
} }
for (int i = 1; i <= 11; i++) for (int i = 1; i <= 10; i++)
{ {
IdList.Add(i); IdList.Add(i);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!