diff --git a/Rs.SkyLine/Flow/TakeTrayFlow.cs b/Rs.SkyLine/Flow/TakeTrayFlow.cs index 14d85dc..adcbeae 100644 --- a/Rs.SkyLine/Flow/TakeTrayFlow.cs +++ b/Rs.SkyLine/Flow/TakeTrayFlow.cs @@ -147,20 +147,24 @@ namespace Rs.MotionPlat.Flow case ETakeTrayFlowStep.取料盘完成抬起: Ops.Off("上下气缸电磁阀动位"); Ops.On("上下气缸电磁阀原位"); - Thread.Sleep(1000); + stopwatch.Restart(); step = ETakeTrayFlowStep.取料盘后真空检测; break; case ETakeTrayFlowStep.取料盘后真空检测: - if (Ops.IsOn("上下气缸原位") && Ops.IsOn("夹爪真空吸检测")) + if(stopwatch.ElapsedMilliseconds<5000) { - step = ETakeTrayFlowStep.到放料盘上方; - if(m_fromTray== EStockType.Empty2) + if (Ops.IsOn("上下气缸原位") && Ops.IsOn("夹爪真空吸检测")) { - StockManager.Instance.Load(m_fromTray); + step = ETakeTrayFlowStep.到放料盘上方; + if (m_fromTray == EStockType.Empty2) + { + StockManager.Instance.Load(m_fromTray); + } } } else { + stopwatch.Stop(); Msg.ShowError("取料盘失败,点击确定后重取"); step = ETakeTrayFlowStep.到下方取料盘; }