From 388a3165ed8bf9b866e8af64f1874abbcb167285 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Fri, 29 Dec 2023 21:57:10 +0900
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E6=8E=92=E6=96=99=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8ER=E8=BD=B4=E5=9B=9E=E5=8E=9F=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 28 +++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

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<double>("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<double>("LoadYStartPos"), GlobalVar.WholeSpeed);
                         if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis)
                         {