충돌 병합

Dev/OHV/VehicleControlSystem/Managers/Scheduler.cs

@@ -154,21 +154,49 @@ namespace VehicleControlSystem.Managers
             logger.D("[Scheduler] - Command Thread Dispose");
         }
 
+        int copyTarget = 0, copyPoint = 0;
+
         void DryRunTest()
         {
             if ( !IsCreateDryRunCommand )
                 return;
 
-            var ram = NumUtils.Random( 0, RouteManager.Instance.Equipments.Count - 1 );
-            var target = RouteManager.Instance.Equipments[ram];
-            if ( target.Name.Equals( "CHARGING_01" ) || target.pointID == 17 )
+            var ram = NumUtils.Random( 0 , RouteManager.Instance.Equipments.Count - 1 );
+            if ( ram == this.copyTarget )
                 return;
+            else
+            {
+                this.copyTarget = ram;
+
+                var target = RouteManager.Instance.Equipments[ ram ];
+
+                //if ( target.Name.Equals( "CHARGING_01" ) || target.pointID == 17 )
+                //    return;
+
+                if ( copyPoint == target.pointID )
+                    return;
+                else
+                {
+                    if ( ( target.Name.Equals( "CHARGING_02" ) ) || ( target.Name.Equals( "STOKER_LIFT_IP01" ) ) ||
+                    ( target.Name.Equals( "STOKER_LIFT_OP01" ) ) || ( target.Name.Equals( "WORK_STATION_IP01" ) ) ||
+                    ( target.Name.Equals( "WORK_STATION_OP01" ) ) )
+                    {
+                        copyPoint = target.pointID;
+
+                        var targetPoint = target.pointID.ToString();
+                        Command cmd = new Command() { TargetID = targetPoint , Type = eCommandType.Move };
+                        cmd.ByWho = eCommandByWho.LocalSystem;
+
+                        this.AddCommand( cmd );
+                    }
+                }
 
-            var targetPoint = target.pointID.ToString();
-            Command cmd = new Command() { TargetID = targetPoint, Type = eCommandType.Move };
-            cmd.ByWho = eCommandByWho.LocalSystem;
+                //var targetPoint = target.pointID.ToString();
+                //Command cmd = new Command() { TargetID = targetPoint , Type = eCommandType.Move };
+                //cmd.ByWho = eCommandByWho.LocalSystem;
 
-            this.AddCommand( cmd );
+                //this.AddCommand( cmd );
+            }
         }
 
         private void DoWork( Command cmd )