diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index fa3cdc7..f270f8f 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1221,46 +1221,56 @@ namespace Rs.MotionPlat.Flow logInfo = $"周转{nozzle.NozzleIndex}号吸嘴无粘料"; MessageQueue.Instance.Insert(logInfo); // nozzle.CloseVac(); - VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); + VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, false, nozzle.NozzleIndex); } } if (masticSlots.Count > 0) { - //粘料报警 - //alarmInfo = $"周转吸头{masticSlots.ToJoinString()}号吸嘴真空异常粘料,请手工处理"; - //alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.周转头粘料报警), masticSlots.ToJoinString()); - alarmEntity = AlarmCollection.Get(AlarmConstID.周转头粘料报警).Transform(masticSlots.ToJoinString()); - //TestCenterMessageBox.Show(AlarmConstID.NozzleTackinessAlarm, alarmInfo, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText()); - //msgBox = MsgBox.ShowDialog(AlarmConstID.周转头粘料报警, alarmInfo, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText());// TestCenterMessageBox.WaitResult(AlarmConstID.NozzleTackinessAlarm); - ETipButton btnRet = AlarmMessageBox.ShowDialog(alarmEntity, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText()); - //switch (msgBox.Button) - switch (btnRet) - { - case ETipButton.Skip: - logInfo = GetClassName() + $"点击了跳过按钮"; - MessageQueue.Instance.Insert(logInfo); - foreach (int nozzleIndex in masticSlots) - { - TransitNozzle nozzle = TransitNozzleManager.Instance.Nozzle(nozzleIndex); - if (!nozzle.HasVacSignal()) + bool exit = false; + while(!exit) + { + //粘料报警 + //alarmInfo = $"周转吸头{masticSlots.ToJoinString()}号吸嘴真空异常粘料,请手工处理"; + //alarmInfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.周转头粘料报警), masticSlots.ToJoinString()); + alarmEntity = AlarmCollection.Get(AlarmConstID.周转头粘料报警).Transform(masticSlots.ToJoinString()); + //TestCenterMessageBox.Show(AlarmConstID.NozzleTackinessAlarm, alarmInfo, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText()); + //msgBox = MsgBox.ShowDialog(AlarmConstID.周转头粘料报警, alarmInfo, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText());// TestCenterMessageBox.WaitResult(AlarmConstID.NozzleTackinessAlarm); + ETipButton btnRet = AlarmMessageBox.ShowDialog(alarmEntity, MessageButtonManager.GetSkip_MoveToSafe_Button(), MessageButtonManager.GetSkip_MoveToSafe_ButtonText()); + //switch (msgBox.Button) + switch (btnRet) + { + case ETipButton.Skip: + logInfo = GetClassName() + $"点击了跳过按钮"; + MessageQueue.Instance.Insert(logInfo); + foreach (int nozzleIndex in masticSlots.ToArray()) { - //nozzle.CloseVac(); - //nozzle.OpenBreak(); - //nozzle.CloseBreak(); - VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); - VacManager.TransitNozzleVacBreak(ETurnoverNozzlePosition.Socket, EVacOperator.Open, true, nozzle.NozzleIndex); - VacManager.TransitNozzleVacBreak(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); - nozzle.Clear(); + TransitNozzle nozzle = TransitNozzleManager.Instance.Nozzle(nozzleIndex); + if (!nozzle.HasVacSignal()) + { + //nozzle.CloseVac(); + //nozzle.OpenBreak(); + //nozzle.CloseBreak(); + VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); + VacManager.TransitNozzleVacBreak(ETurnoverNozzlePosition.Socket, EVacOperator.Open, true, nozzle.NozzleIndex); + VacManager.TransitNozzleVacBreak(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); + nozzle.Clear(); + masticSlots.Remove(nozzleIndex); + GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); + } } - } - break; - case ETipButton.Yes: - MessageQueue.Instance.Insert(GetClassName() + $"点击了移动到安全位按钮"); - TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); - //Start(); - break; - default: - break; + if (masticSlots.Count == 0) + { + exit = true; + } + break; + case ETipButton.Yes: + MessageQueue.Instance.Insert(GetClassName() + $"点击了移动到安全位按钮"); + TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); + //Start(); + break; + default: + break; + } } } else @@ -3008,7 +3018,7 @@ namespace Rs.MotionPlat.Flow logInfo = $"周转{nozzle.NozzleIndex}号吸嘴无粘料"; MessageQueue.Instance.Insert(logInfo); //nozzle.CloseVac(); - VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, true, nozzle.NozzleIndex); + VacManager.TransitNozzleVacSuction(ETurnoverNozzlePosition.Socket, EVacOperator.Close, false, nozzle.NozzleIndex); } } if (masticSlots.Count > 0)