优化手动治具取放料不动

Rs.DeweyTester/Flow/SubFlow/FixturePlaceFlow.cs

@@ -58,7 +58,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
         /// <summary>
         /// 治具放料
         /// </summary>
-        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;

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;

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);
+                FixturePlaceFlow.Instance.Place(int.Parse(((Button)sender).Tag.ToString()), nozzleIndex,true,false);
-                double curLoadX = Ops.GetCurPosition(AxisControl.LoadX);
+                //double curLoadX = Ops.GetCurPosition(AxisControl.LoadX);
                 //if(curLoadX-GlobalVar.FixtureSafePosX>50)
                 //{
                 //    DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToStock);