Skip to content

李娜 / SO827-AssemblyLine

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

D7放料逻辑优化

1 个父辈 63865550
内嵌 并排
正在显示 2 个修改的文件 包含 46 行增加 和 22 行删除
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -482,7 +482,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -482,7 +482,7 @@ namespace OnlineStore.DeviceLibrary
{ {
yellowShanShuo = true; yellowShanShuo = true;
} }
if (isInSuddenDown||isNoAirCheck||alarmType>LineAlarmType.AxisAlarm ) if (isInSuddenDown||isNoAirCheck||alarmType>=LineAlarmType.IoSingleTimeOut)
{ {
isNeedAlarmLed = true; isNeedAlarmLed = true;
} }
...@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary
foreach (EquipBase moveEquip in AllEquipMap.Values) foreach (EquipBase moveEquip in AllEquipMap.Values)
{ {
if (moveEquip.isNoAirCheck || moveEquip.isInSuddenDown || moveEquip.alarmType > LineAlarmType.AxisAlarm) if (moveEquip.isNoAirCheck || moveEquip.isInSuddenDown || moveEquip.alarmType >= LineAlarmType.IoSingleTimeOut)
{ {
isNeedAlarmLed = true; isNeedAlarmLed = true;
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -645,6 +645,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -645,6 +645,30 @@ namespace OnlineStore.DeviceLibrary
InLog("入库 " + MoveInfo.SLog + "，前后气缸后退，等待300 "); InLog("入库 " + MoveInfo.SLog + "，前后气缸后退，等待300 ");
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After); CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
if (OnlyProOutTray)
{
string code = MoveInfo.MoveParam.WareCode;
if (MoveInfo.MoveParam.IsNG)
{
OutLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask ");
string msg = SServerManager.cancelPutInTask(Name, code);
afterPutCutOK = true;
}
else
{
OutLog(MoveInfo.SLog + "，工单料到达接驳台，发送 arrive3fRobotLocation ");
string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
afterPutCutOK = true;
}
InLog("出料移栽 " + MoveInfo.SLog + "，提前通知出料机构取料");
LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
}
else
{
afterPutCutOK = true;
}
} }
else else
{ {
...@@ -656,26 +680,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -656,26 +680,26 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.MI_14_CylinderAfter)) else if (MoveInfo.IsStep(LineMoveStep.MI_14_CylinderAfter))
{ {
MoveInfo.NextMoveStep(LineMoveStep.MI_15_SendPosToStore); MoveInfo.NextMoveStep(LineMoveStep.MI_15_SendPosToStore);
string code = MoveInfo.MoveParam.WareCode; //string code = MoveInfo.MoveParam.WareCode;
if (OnlyProOutTray) //if (OnlyProOutTray)
{ //{
if (MoveInfo.MoveParam.IsNG) // if (MoveInfo.MoveParam.IsNG)
{ // {
OutLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask "); // OutLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask ");
string msg = SServerManager.cancelPutInTask(Name, code); // string msg = SServerManager.cancelPutInTask(Name, code);
afterPutCutOK = true; // afterPutCutOK = true;
} // }
else // else
{ // {
OutLog(MoveInfo.SLog + "，工单料到达接驳台，发送 arrive3fRobotLocation "); // OutLog(MoveInfo.SLog + "，工单料到达接驳台，发送 arrive3fRobotLocation ");
string msg = SServerManager.arrive3fRobotLocation(Name, 1, code); // string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
afterPutCutOK = true; // afterPutCutOK = true;
} // }
} //}
else //else
{ //{
afterPutCutOK = true; // afterPutCutOK = true;
} //}
InLog("入库 " + MoveInfo.SLog + "，通知BOX开始入库，等待3000"); InLog("入库 " + MoveInfo.SLog + "，通知BOX开始入库，等待3000");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!