From 09b247e3abcaf3f40138bde700ef144186ca1feb Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 14 Jun 2024 15:59:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E5=85=B7=E6=94=BE=E6=96=99=E7=9C=9F?= =?UTF-8?q?=E7=A9=BA=E5=90=B8=E6=8A=A5=E8=AD=A6=E4=B9=8B=E5=89=8D=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=AC=A1=E7=9C=9F=E7=A9=BA?= =?UTF-8?q?=E5=90=B8=E6=A3=80=E6=B5=8B=EF=BC=8C=E6=A3=80=E6=B5=8B=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=85=88=E5=85=B3=E9=97=AD=E7=9C=9F=E7=A9=BA=E5=90=B8?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=89=93=E5=BC=80=E7=9C=9F=E7=A9=BA=E5=90=B8?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 58 +++++++++++++------ .../SafePosFlow/TransitModuleSafePosFlow.cs | 10 ++-- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 449b3fc..b52dacd 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -309,7 +309,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + "选择了移动到安全位"; MessageQueue.Instance.Insert(logInfo); DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); - Start(); + //Start(); break; default: break; @@ -494,7 +494,7 @@ namespace Rs.MotionPlat.Flow logInfo = $"选择了移动到安全位"; MessageQueue.Instance.Insert(logInfo); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TurnoverTray); - Start(); + //Start(); break; default: break; @@ -916,7 +916,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + $"点击了移动到安全位按钮"; MessageQueue.Instance.Insert(logInfo); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); - Start(); + //Start(); break; default: break; @@ -1230,7 +1230,7 @@ namespace Rs.MotionPlat.Flow case ETipButton.Yes: MessageQueue.Instance.Insert(GetClassName() + $"点击了移动到安全位按钮"); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); - Start(); + //Start(); break; default: break; @@ -1308,7 +1308,7 @@ namespace Rs.MotionPlat.Flow LogHelper.Debug($"治具穴位{nozzle.NozzleIndex}光钎异常"); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } @@ -1339,7 +1339,7 @@ namespace Rs.MotionPlat.Flow LogHelper.Debug($"治具穴位{nozzle.NozzleIndex}光钎异常"); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } @@ -1349,7 +1349,31 @@ namespace Rs.MotionPlat.Flow } if (nozzle.IsHasProduct) { - if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace || GlobalVar.DisableFixtureVacuumCheck) + bool bCheckOk = false; + for(int i=0;i<2;i++) + { + if(i==1) + { + MessageQueue.Instance.Insert(GetClassName() + "第二次真空检测，先关闭真空，再打开真空吸"); + VacManager.TestTrayVacSuction(EVacOperator.Close,true,nozzle.NozzleIndex); + Thread.Sleep(500); + VacManager.TestTrayVacSuction(EVacOperator.Open,true,nozzle.NozzleIndex); + Thread.Sleep(500); + } + if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace || GlobalVar.DisableFixtureVacuumCheck) + { + bCheckOk = true; + break; + } + } + //if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace || GlobalVar.DisableFixtureVacuumCheck) + //{ + // GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); + // GlobalTray.TestTray.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.Have); + // TestTrayManager.Instance.Slot(nozzle.NozzleIndex).AddProduct(nozzle); + // nozzle.Clear(); + //} + if(bCheckOk) { GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); GlobalTray.TestTray.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.Have); @@ -1434,7 +1458,7 @@ namespace Rs.MotionPlat.Flow LogHelper.Debug($"治具穴位{nozzle.NozzleIndex}真空异常"); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } @@ -1829,7 +1853,7 @@ namespace Rs.MotionPlat.Flow { TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } @@ -1859,7 +1883,7 @@ namespace Rs.MotionPlat.Flow { TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); } - Start(); + //Start(); break; } } @@ -1904,7 +1928,7 @@ namespace Rs.MotionPlat.Flow case ETipButton.Yes://移动到安全位 VacManager.TestTrayVacSuction(EVacOperator.Close, true, slot.Index); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); - Start(); + //Start(); break; } } @@ -1926,7 +1950,7 @@ namespace Rs.MotionPlat.Flow case ETipButton.Yes://移动到安全位 VacManager.TestTrayVacSuction(EVacOperator.Close, true, slot.Index); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); - Start(); + //Start(); break; } } @@ -2125,7 +2149,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + $"选择了移动到安全位按钮"; MessageQueue.Instance.Insert(logInfo); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketTakeFail); - Start(); + //Start(); //if (testedSlots.Select(ts => (ts.Index >= 9 && ts.Index <= 16)).Count() > 0) //{ // TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.SocketFrom9ToSixteen); @@ -2186,7 +2210,7 @@ namespace Rs.MotionPlat.Flow { TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.Socket); } - Start(); + //Start(); break; default: break; @@ -2596,7 +2620,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + $"点击了移动到安全位按钮"; MessageQueue.Instance.Insert(logInfo); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); - Start(); + //Start(); break; default: break; @@ -2907,7 +2931,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + "点击了移动到安全位按钮"; MessageQueue.Instance.Insert(logInfo); TransitModuleSafePosFlow.Instance.GoSafePostion(EExceptionSafePos.TransitNozzle); - Start(); + //Start(); break; default: break; @@ -3010,7 +3034,7 @@ namespace Rs.MotionPlat.Flow logInfo = GetClassName() + "选择了移动到安全位"; MessageQueue.Instance.Insert(logInfo); DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); - Start(); + //Start(); break; default: break; diff --git a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs index 6fd767a..d8aa3ef 100644 --- a/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs +++ b/Rs.SkyLine/Flow/SafePosFlow/TransitModuleSafePosFlow.cs @@ -78,11 +78,11 @@ namespace Rs.MotionPlat.Flow.SafePosFlow } while (!finished) { - if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) - { - Thread.Sleep(10); - continue; - } + //if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + //{ + // Thread.Sleep(10); + // continue; + //} switch (step) { case ETransitModuleSafePosFlowStep.抬起Z轴: