lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化料仓上下料流程，当下料是检测是否能够下料

Browse Source
master
lhiven 2 years ago
parent 60ce2829ef
commit 35066920d5
2 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File

23
Rs.SkyLine/Flow/Space/TrayTest.cs
Unescape Escape View File

@ -117,14 +117,23 @@ namespace Rs.AutoDischarge.V3.Flow
} }
else if (NeedLoad) else if (NeedLoad)
{ {
//上料 if(!Ops.IsOn($"{stockNo}号料仓料盘到位光电检测"))
Status= ETrayStatus.Loading; {
finished = false; //上料
NeedLoad = false; Status = ETrayStatus.Loading;
if (m_bWholeLoad) finished = false;
Step = ETrayTestStep.到上料接料盘位; NeedLoad = false;
if (m_bWholeLoad)
Step = ETrayTestStep.到上料接料盘位;
else
Step = ETrayTestStep.到上料终点位;
}
else else
Step = ETrayTestStep.到上料终点位; {
Msg.ShowError($"检测到{stockNo}号料仓处有料盘，不能重复送料盘");
MessageQueue.Instance.Warn($"检测到{stockNo}号料仓处有料盘，不能重复送料盘");
LogHelper.Debug($"检测到{stockNo}号料仓处有料盘，不能重复送料盘");
}
} }
} }

61
Rs.SkyLine/Flow/WorkFlow.cs
Unescape Escape View File

@ -558,6 +558,24 @@ namespace Rs.MotionPlat.Flow
curSlotPoint = TrayPointManager.GetSlotPoint(GlobalVar.CurRecipe, "Turnover", curNozzle.ToIndex + 1, EPointType.RUN); curSlotPoint = TrayPointManager.GetSlotPoint(GlobalVar.CurRecipe, "Turnover", curNozzle.ToIndex + 1, EPointType.RUN);
turnoverOffsetPoint = TurnoverSlotOffset.GetOffsetPoint(curNozzle.ToIndex + 1); turnoverOffsetPoint = TurnoverSlotOffset.GetOffsetPoint(curNozzle.ToIndex + 1);
} }
else if (curNozzle.ToType == TurnoverType.ToBeTested)
{
downSlot = GlobalTray.InputTray.GetSlot(ESlotStatus.NotHave);
if (downSlot != null)
{
curSlotPoint = TrayPointManager.GetSlotPoint(GlobalVar.CurRecipe, "Input", downSlot.Index, EPointType.RUN);
}
else
{
Msg.ShowInfo("Input已满，请手动切盘后点击确定！");
GlobalTray.InputTray.ResetTray();
GlobalTray.InputTray.Clear();
//StockManager.Instance.UnLoad(EStockType.Multi);
//restoreFlowStep = EWorkFlowStep.到放料位上方;
//flowStep = EWorkFlowStep.等待Multi料仓收料完成;
}
}
else if (curNozzle.ToType == TurnoverType.Passed) else if (curNozzle.ToType == TurnoverType.Passed)
{ {
//OK料仓切盘 //OK料仓切盘
@ -568,13 +586,16 @@ namespace Rs.MotionPlat.Flow
} }
else else
{ {
//Msg.ShowInfo("tray has take over,please change tray"); Msg.ShowInfo("OK料盘已满，请手动切盘后点击确定");
//GlobalTray.OkTary.ResetTray(); GlobalTray.OkTary.ResetTray();
//GlobalTray.OkTary.Clear(); GlobalTray.OkTary.Clear();
//TakeTrayFlow.Instance.Take(EStockType.Input, EStockType.Empty1, ELoadUnloadType.Unload); //TakeTrayFlow.Instance.Take(EStockType.Input, EStockType.Empty1, ELoadUnloadType.Unload);
StockManager.Instance.UnLoad(EStockType.Ok);
restoreFlowStep = EWorkFlowStep.到放料位上方;
flowStep = EWorkFlowStep.等待Ok料仓收料完成; //StockManager.Instance.UnLoad(EStockType.Ok);
//restoreFlowStep = EWorkFlowStep.到放料位上方;
//flowStep = EWorkFlowStep.等待Ok料仓收料完成;
} }
} }
else if (curNozzle.ToType == TurnoverType.Failed) else if (curNozzle.ToType == TurnoverType.Failed)
@ -586,11 +607,14 @@ namespace Rs.MotionPlat.Flow
} }
else else
{ {
//GlobalTray.NgTray.ResetTray(); Msg.ShowInfo("NG料盘已满，请手动切盘后点击确定！");
//GlobalTray.NgTray.Clear(); GlobalTray.NgTray.ResetTray();
StockManager.Instance.UnLoad(EStockType.Ng); GlobalTray.NgTray.Clear();
restoreFlowStep = EWorkFlowStep.到放料位上方;
flowStep = EWorkFlowStep.等待Ng料仓收料完成;
//StockManager.Instance.UnLoad(EStockType.Ng);
//restoreFlowStep = EWorkFlowStep.到放料位上方;
//flowStep = EWorkFlowStep.等待Ng料仓收料完成;
} }
} }
else if (curNozzle.ToType == TurnoverType.Multifunction) else if (curNozzle.ToType == TurnoverType.Multifunction)
@ -602,13 +626,18 @@ namespace Rs.MotionPlat.Flow
} }
else else
{ {
//GlobalTray.MultiTray.ResetTray(); Msg.ShowInfo("多功能料盘已满，请手动切盘后点击确定！");
//GlobalTray.MultiTray.Clear(); GlobalTray.MultiTray.ResetTray();
StockManager.Instance.UnLoad(EStockType.Multi); GlobalTray.MultiTray.Clear();
restoreFlowStep = EWorkFlowStep.到放料位上方;
flowStep = EWorkFlowStep.等待Multi料仓收料完成;
//StockManager.Instance.UnLoad(EStockType.Multi);
//restoreFlowStep = EWorkFlowStep.到放料位上方;
//flowStep = EWorkFlowStep.等待Multi料仓收料完成;
} }
} }
} }
if (curSlotPoint!=null) if (curSlotPoint!=null)

Write Preview
Loading…
Cancel
Save