From 89f7996e562b03ba4e6481be2a6e973f363adfcd Mon Sep 17 00:00:00 2001 From: lhiven Date: Sat, 10 Aug 2024 16:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E5=8A=A8=E6=B2=BB?= =?UTF-8?q?=E5=85=B7=E5=8F=96=E6=94=BE=E6=96=99=E4=B8=8D=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs | 4 ++-- Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs | 4 ++-- Rs.DeweyTester/SysConfig/FixtureConfig.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs index 5659cda..d3140cd 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs @@ -58,7 +58,7 @@ namespace Rs.MotionPlat.Flow.SubFlow /// /// 治具放料 /// - public void Place(int fixtureIndex,int nozzleIndex,bool bTest=false) + public void Place(int fixtureIndex,int nozzleIndex,bool bTest=false, bool needStop = true) { if (finished) finished = false; @@ -71,7 +71,7 @@ namespace Rs.MotionPlat.Flow.SubFlow Nozzle curNozzle=NozzleManager.GetNozzle(nozzleIndex); while (!finished) { - if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop && needStop) { Thread.Sleep(10); continue; diff --git a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs index a4cdd8f..b94e860 100644 --- a/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/FixtureTakeFlow.cs @@ -56,7 +56,7 @@ namespace Rs.MotionPlat.Flow.SubFlow } AlarmEntity alarmEntity = new AlarmEntity(); - public void Take(int fixtureIndex,int nozzleIndex=-1,bool btest=false) + public void Take(int fixtureIndex,int nozzleIndex=-1,bool btest=false, bool needStop = true) { if (finished) finished = false; @@ -70,7 +70,7 @@ namespace Rs.MotionPlat.Flow.SubFlow while (!finished) { - if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + if (MachineManage.Instance.MachineStatus == EMachineStatus.Stop && needStop) { Thread.Sleep(10); continue; diff --git a/Rs.DeweyTester/SysConfig/FixtureConfig.cs b/Rs.DeweyTester/SysConfig/FixtureConfig.cs index 5f19cd1..b1bc33a 100644 --- a/Rs.DeweyTester/SysConfig/FixtureConfig.cs +++ b/Rs.DeweyTester/SysConfig/FixtureConfig.cs @@ -183,7 +183,7 @@ namespace Rs.MotionPlat.SysConfig if (rbtnNozzle4.Checked) nozzleIndex = 4; Task.Run(() => { - FixtureTakeFlow.Instance.Take(int.Parse(((Button)sender).Tag.ToString()), nozzleIndex,true); + FixtureTakeFlow.Instance.Take(int.Parse(((Button)sender).Tag.ToString()), nozzleIndex,true,false); //double curLoadX = Ops.GetCurPosition(AxisControl.LoadX); //if (curLoadX - GlobalVar.FixtureSafePosX > 50) //{ @@ -205,8 +205,8 @@ namespace Rs.MotionPlat.SysConfig if (rbtnNozzle4.Checked) nozzleIndex = 4; Task.Run(() => { - FixturePlaceFlow.Instance.Place(int.Parse(((Button)sender).Tag.ToString()), nozzleIndex,true); - double curLoadX = Ops.GetCurPosition(AxisControl.LoadX); + FixturePlaceFlow.Instance.Place(int.Parse(((Button)sender).Tag.ToString()), nozzleIndex,true,false); + //double curLoadX = Ops.GetCurPosition(AxisControl.LoadX); //if(curLoadX-GlobalVar.FixtureSafePosX>50) //{ // DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToStock);