From fe24183d0e19be9018a4384c94b6dff2c0770707 Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 26 Dec 2023 17:20:01 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=89=E7=BA=A4=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=EF=BC=8C=E5=BD=93=E5=85=89=E7=BA=A4=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C=E5=85=88=E7=94=A8=E5=8E=8B?= =?UTF-8?q?=E5=A4=B4=E4=B8=8B=E5=8E=8B=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 65 +++++++++++----------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 1d334ab..905d832 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -717,41 +717,44 @@ namespace Rs.MotionPlat.Flow //先检测光纤 if(GlobalVar.EnableTestFixtureFiberCheck)//如果启用光纤 { - if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位光纤检测") || GlobalVar.RunSpace) + if (Ops.IsOff($"测试{nozzle.NozzleIndex}号穴位光纤检测") || GlobalVar.RunSpace) { - bool exit = false; - while (!exit) + //如果出现光纤异常，先用压头压一下 + FiberWarningPressFlow.Instance.Press(); + //压一下之后如果还出现异常，则报警 + if(Ops.IsOff($"测试{nozzle.NozzleIndex}号穴位光纤检测")) { - alarmInfo = $"测试治具{nozzle.NozzleIndex}号光纤异常，有可能叠料，请处理"; - MessageQueue.Instance.Warn(GetClassName() + alarmInfo); - TestCenterMessageBox.Show(AlarmConstID.NozzlesLoseMaterialAlarm, alarmInfo, MessageButtonManager.GetRetry_Skip_MoveToSafe_Button(), MessageButtonManager.GetRetry_Skip_MoveToSafe_ButtonText()); - msgBox = TestCenterMessageBox.WaitResult(AlarmConstID.NozzlesLoseMaterialAlarm); - switch (msgBox.Button) + bool exit = false; + while (!exit) { - case ETipButton.Retry: - VacManager.TestTrayVacSuction(EVacOperator.Open, nozzle.NozzleIndex); - if (!Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位光纤检测") || GlobalVar.RunSpace) - { - //GlobalTray.TestTray.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.Have); - //TestTrayManager.Instance.Slot(nozzle.NozzleIndex).AddProduct(nozzle); - //nozzle.Clear(); - exit = true; - } - break; - case ETipButton.Skip: - //镭射头过来复检，有产品则继续报警 - TestHeightResult heightReulst = LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex); - if (!heightReulst.HasProduct) - { + alarmInfo = $"测试治具{nozzle.NozzleIndex}号穴位光纤异常，有可能叠料，请处理"; + MessageQueue.Instance.Warn(GetClassName() + alarmInfo); + TestCenterMessageBox.Show(AlarmConstID.NozzlesLoseMaterialAlarm, alarmInfo, MessageButtonManager.GetRetry_Skip_MoveToSafe_Button(), MessageButtonManager.GetRetry_Skip_MoveToSafe_ButtonText()); + msgBox = TestCenterMessageBox.WaitResult(AlarmConstID.NozzlesLoseMaterialAlarm); + switch (msgBox.Button) + { + case ETipButton.Retry: + VacManager.TestTrayVacSuction(EVacOperator.Open, nozzle.NozzleIndex); + if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位光纤检测") || GlobalVar.RunSpace) + { + exit = true; + } + break; + case ETipButton.Skip: + //镭射头过来复检，有产品则继续报警 + TestHeightResult heightReulst = LaserFlow.Instance.HasProduct(ETrayType.Test, nozzle.NozzleIndex); + if (!heightReulst.HasProduct) + { + VacManager.TestTrayVacSuction(EVacOperator.Close, nozzle.NozzleIndex); + nozzle.Clear(); + exit = true; + } + break; + case ETipButton.Yes://移动到安全位 VacManager.TestTrayVacSuction(EVacOperator.Close, nozzle.NozzleIndex); - nozzle.Clear(); - exit = true; - } - break; - case ETipButton.Yes://移动到安全位 - VacManager.TestTrayVacSuction(EVacOperator.Close, nozzle.NozzleIndex); - TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); - break; + TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); + break; + } } } }