diff --git a/Rs.SkyLine/Flow/WorkEnvironment.cs b/Rs.SkyLine/Flow/WorkEnvironment.cs index d6502f4..4be8189 100644 --- a/Rs.SkyLine/Flow/WorkEnvironment.cs +++ b/Rs.SkyLine/Flow/WorkEnvironment.cs @@ -84,22 +84,28 @@ namespace Rs.MotionPlat.Flow //if (StockManager.Instance.HasTray(EStockType.Empty2)) { //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); - Task.Run(() => { + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); }); - }, null, - () => { - - Task.Run(() => { + }, null, + () => + { + + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null); }); - })) - { + }); + //) + //{ step = EStockCheckStep.Ng料仓是否就绪; - } + //} //restoreStep = EStockCheckStep.Ng料仓是否就绪; } @@ -117,22 +123,28 @@ namespace Rs.MotionPlat.Flow //if (StockManager.Instance.HasTray(EStockType.Empty2)) { //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); - Task.Run(() => { + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); }); }, null, - () => { - Task.Run(() => { + () => + { + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null); - } ); - })) - { + }); + }); + //) + //{ step = EStockCheckStep.Multi料仓是否就绪; - } + //} //restoreStep = EStockCheckStep.Multi料仓是否就绪; } @@ -150,21 +162,27 @@ namespace Rs.MotionPlat.Flow //if (StockManager.Instance.HasTray(EStockType.Empty2)) { //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); - Task.Run(() => { + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); }); }, null, - () => { - Task.Run(() => { + () => + { + Task.Run(() => + { StockManager.Instance.GetStock(ETrayType.Multi).Load(EStockTrayLoadMode.AfterTakeTray, null); }); - })) - { + }); + //) + //{ step = EStockCheckStep.等待所有料仓就绪; - } + //} //restoreStep = EStockCheckStep.等待所有料仓就绪; }