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

修复当放料盘后料盘还没有到位时按启动按钮，导致给料仓重复上料的问题

Browse Source
master
lhiven 1 year ago
parent 83628dc289
commit 643fcd2663
1 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File

72
Rs.SkyLine/Flow/WorkEnvironment.cs
Unescape Escape View File

@ -84,22 +84,28 @@ namespace Rs.MotionPlat.Flow
//if (StockManager.Instance.HasTray(EStockType.Empty2)) //if (StockManager.Instance.HasTray(EStockType.Empty2))
{ {
//LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ok"); //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ok");
if(TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ok, //if(
() => { TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ok,
() =>
{
GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null);
Task.Run(() => { Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null);
}); });
}, null, }, null,
() => { () =>
{
Task.Run(() => {
Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null); StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null);
}); });
})) });
{ //)
//{
step = EStockCheckStep.Ng料仓是否就绪; step = EStockCheckStep.Ng料仓是否就绪;
} //}
//restoreStep = EStockCheckStep.Ng料仓是否就绪; //restoreStep = EStockCheckStep.Ng料仓是否就绪;
} }
@ -117,22 +123,28 @@ namespace Rs.MotionPlat.Flow
//if (StockManager.Instance.HasTray(EStockType.Empty2)) //if (StockManager.Instance.HasTray(EStockType.Empty2))
{ {
//LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ng"); //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ng");
if (TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ng, //if (
() => { TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ng,
() =>
{
GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null);
Task.Run(() => { Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null);
}); });
}, null, }, null,
() => { () =>
Task.Run(() => { {
Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null); StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null);
} ); });
})) });
{ //)
//{
step = EStockCheckStep.Multi料仓是否就绪; step = EStockCheckStep.Multi料仓是否就绪;
} //}
//restoreStep = EStockCheckStep.Multi料仓是否就绪; //restoreStep = EStockCheckStep.Multi料仓是否就绪;
} }
@ -150,21 +162,27 @@ namespace Rs.MotionPlat.Flow
//if (StockManager.Instance.HasTray(EStockType.Empty2)) //if (StockManager.Instance.HasTray(EStockType.Empty2))
{ {
//LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Multi"); //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Multi");
if(TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Multi, //if (
() => { TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Multi,
() =>
{
GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null);
Task.Run(() => { Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null);
}); });
}, null, }, null,
() => { () =>
Task.Run(() => { {
Task.Run(() =>
{
StockManager.Instance.GetStock(ETrayType.Multi).Load(EStockTrayLoadMode.AfterTakeTray, null); StockManager.Instance.GetStock(ETrayType.Multi).Load(EStockTrayLoadMode.AfterTakeTray, null);
}); });
})) });
{ //)
//{
step = EStockCheckStep.等待所有料仓就绪; step = EStockCheckStep.等待所有料仓就绪;
} //}
//restoreStep = EStockCheckStep.等待所有料仓就绪; //restoreStep = EStockCheckStep.等待所有料仓就绪;
} }

Write Preview
Loading…
Cancel
Save