diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 1797d04..7aaef7d 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -179,7 +179,7 @@ namespace Rs.MotionPlat.Flow } } curNozzle = NozzleManager.GetIdelNozzle(); - if (curTask!=null && curNozzle != null) + if (curTask!=null && curNozzle != null && AxisControl.GetAxis($"NozzleR{curNozzle.NozzleIndex}").HomeStatus == EHomeStatus.Finished) { if (XYCanMove() || GlobalVar.VirtualAxis) { @@ -1660,15 +1660,23 @@ namespace Rs.MotionPlat.Flow errCode = AxisControl.LoadX.MovePos(SysConfigParam.GetValue("LoadXStartPos"), GlobalVar.WholeSpeed); if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis) { - AxisControl.GetAxis($"NozzleZ1").Home(); - AxisControl.GetAxis($"NozzleZ2").Home(); - AxisControl.GetAxis($"NozzleZ3").Home(); - AxisControl.GetAxis($"NozzleZ4").Home(); - AxisControl.GetAxis($"NozzleZ5").Home(); - AxisControl.GetAxis($"NozzleZ6").Home(); - AxisControl.GetAxis($"NozzleZ7").Home(); - AxisControl.GetAxis($"NozzleZ8").Home(); - AxisControl.GetAxis($"NozzleZ9").Home(); + AxisControl.NozzleZ1.Home(); + AxisControl.NozzleZ2.Home(); + AxisControl.NozzleZ3.Home(); + AxisControl.NozzleZ4.Home(); + AxisControl.NozzleZ5.Home(); + AxisControl.NozzleZ6.Home(); + AxisControl.NozzleZ7.Home(); + AxisControl.NozzleZ8.Home(); + + AxisControl.NozzleR1.Home(); + AxisControl.NozzleR2.Home(); + AxisControl.NozzleR3.Home(); + AxisControl.NozzleR4.Home(); + AxisControl.NozzleR5.Home(); + AxisControl.NozzleR6.Home(); + AxisControl.NozzleR7.Home(); + AxisControl.NozzleR8.Home(); errCode = AxisControl.LoadY.MovePos(SysConfigParam.GetValue("LoadYStartPos"), GlobalVar.WholeSpeed); if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis) {