停留超时逻辑更新

AGVControl-ProductionLine/bean/Agv_Info.cs

@@ -332,7 +332,8 @@ namespace AGVControl
         /// <returns></returns>
         /// <returns></returns>
         private void CheckStandTimeOut(clsPosition position)
         private void CheckStandTimeOut(clsPosition position)
         {
         {
-            if (IsUse && CurJob !=null && !(CurJob is ChargeJob) && !CurTaskName.Contains(SettingString.AutoCharge) && !CurTaskName.Contains(SettingString.Standby))
+            if (IsUse && CurJob !=null && !(CurJob is ChargeJob) && 
+                (!CurTaskName.Contains(SettingString.AutoCharge) || !CurTaskName.Contains(SettingString.Standby)))
             {
             {
                 if (Math.Abs(position.x - Position.x) < 1 && Math.Abs(position.y - Position.y) < 1)
                 if (Math.Abs(position.x - Position.x) < 1 && Math.Abs(position.y - Position.y) < 1)
                 {
                 {
@@ -352,7 +353,14 @@ namespace AGVControl
 
 
                 }
                 }
             }
             }
-
+            else if(CurJob != null && (CurJob is ChargeJob))
+            {
+                StandTimeOut = false;
+            }
+            else
+            {
+                StandTimeOut = false;
+            }
             Position = position;
             Position = position;
         }
         }
         //public void GetPlace(int value)
         //public void GetPlace(int value)