From 643fcd26631bc1154011c19b80277640e4bc0f93 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Sat, 27 Jan 2024 08:24:51 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=94=BE=E6=96=99?= =?UTF-8?q?=E7=9B=98=E5=90=8E=E6=96=99=E7=9B=98=E8=BF=98=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=88=B0=E4=BD=8D=E6=97=B6=E6=8C=89=E5=90=AF=E5=8A=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BB=99=E6=96=99=E4=BB=93?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=8A=E6=96=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/WorkEnvironment.cs | 72 +++++++++++++++++++----------- 1 file changed, 45 insertions(+), 27 deletions(-) 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.等待所有料仓就绪; }