Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -329,7 +329,10 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
                         wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
                     }
                     }
-
+                    else if (wait.WaitType.Equals(WaitEnum.W006_AxisOrg))
+                    {
+                        wait.IsEnd = AxisManager.instance.GetHomeSingle(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(1);
+                    }
                     else
                     else
                     {
                     {
                         wait.IsEnd = CheckWaitResult(moveInfo, wait);
                         wait.IsEnd = CheckWaitResult(moveInfo, wait);

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -50,11 +50,7 @@ namespace OnlineStore.DeviceLibrary
                         wait.IsEnd = true;
                         wait.IsEnd = true;
                     }
                     }
                 }
                 }
-            }
-            else if (wait.WaitType.Equals(WaitEnum.W006_AxisOrg))
-            {
-                wait.IsEnd = AxisManager.instance.GetHomeSingle(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(1);
-            }
+            }        
 
 
             return wait.IsEnd;
             return wait.IsEnd;
         }
         }