添加4C到3C双向运输

DeviceLibrary/manager/MissionManager.cs

@@ -911,6 +911,10 @@ namespace DeviceLibrary.manager
                             {
                             {
                                 liftname = SettingString.LIFT_C1;
                                 liftname = SettingString.LIFT_C1;
                             }
                             }
+                            else if (missionInfo.destinationWorkshop.Equals(SettingString._3D))
+                            {
+                                liftname = SettingString.LIFT_D2;
+                            }
                         }
                         }
                         if (missionInfo.destinationWorkshop.Equals(SettingString._3C))
                         if (missionInfo.destinationWorkshop.Equals(SettingString._3C))
                         {
                         {

DeviceLibrary/manager/NodeManager.cs

@@ -205,11 +205,11 @@ namespace DeviceLibrary.manager
         /// key:车间名
         /// key:车间名
         /// val:线体名
         /// val:线体名
         /// </summary>
         /// </summary>
-       public static Dictionary<string, List<string>> linesInAirShower = new Dictionary<string, List<string>>();
+        public static Dictionary<string, List<string>> linesInAirShower = new Dictionary<string, List<string>>();
         static void InitLinesInAirShower()
         static void InitLinesInAirShower()
         {
         {
             //添加3D的
             //添加3D的
-            linesInAirShower.Add("3D", new List<string>() { "S3Tail","MI7Tail" });
+            linesInAirShower.Add("3D", new List<string>() { "S3Tail", "MI7Tail" });
             //添加4C的
             //添加4C的
             linesInAirShower.Add("4C", new List<string>() { "C14Tail", "C15Tail" });
             linesInAirShower.Add("4C", new List<string>() { "C14Tail", "C15Tail" });
         }
         }
@@ -224,7 +224,18 @@ namespace DeviceLibrary.manager
             isIn = true;
             isIn = true;
             isAirDoor = false;
             isAirDoor = false;
             if (agv.Scope.Workshop.Equals("1F")) return false;
             if (agv.Scope.Workshop.Equals("1F")) return false;
-            if (agv.Scope.Workshop.Equals("4C")) return false;
+            if (agv.Scope.Workshop.Equals("4C"))
+            {
+                if (cur.Workshop.Equals("4C") && next.Type.Equals(NodeType.Lift)&& next.Name.Equals(SettingString.LIFT_D2))
+                {
+                    isIn = false;
+                    return true;
+                }
+                else if ((cur.Workshop.Equals("4D")||(cur.Type.Equals(NodeType.Lift) && cur.Name.Equals(SettingString.LIFT_D2))) && (next.Type.Equals(NodeType.Standby) || next.Type.Equals(NodeType.AutoCharge)))
+                {
+                    return true; 
+                }
+            }
             if (agv.Scope.Workshop.Equals("3C")) return false;
             if (agv.Scope.Workshop.Equals("3C")) return false;
             try
             try
             {
             {
@@ -244,9 +255,9 @@ namespace DeviceLibrary.manager
                 }
                 }
                 else//在相同车间
                 else//在相同车间
                 {
                 {
-                    if(cur.Type.Equals(NodeType.Lift) || cur.Type.Equals(NodeType.Standby) || cur.Type.Equals(NodeType.AutoCharge))
+                    if (cur.Type.Equals(NodeType.Lift) || cur.Type.Equals(NodeType.Standby) || cur.Type.Equals(NodeType.AutoCharge))
                     {
                     {
-                        if(linesInAirShower.ContainsKey(next.Workshop)&& linesInAirShower[next.Workshop].Contains(next.Name))
+                        if (linesInAirShower.ContainsKey(next.Workshop) && linesInAirShower[next.Workshop].Contains(next.Name))
                         {
                         {
                             //电梯到风淋门内
                             //电梯到风淋门内
                             isAirDoor = true;
                             isAirDoor = true;
@@ -254,7 +265,7 @@ namespace DeviceLibrary.manager
                             return true;
                             return true;
                         }
                         }
                     }
                     }
-                    else if(next.Type.Equals(NodeType.Lift) || next.Type.Equals(NodeType.Standby) || next.Type.Equals(NodeType.AutoCharge))
+                    else if (next.Type.Equals(NodeType.Lift) || next.Type.Equals(NodeType.Standby) || next.Type.Equals(NodeType.AutoCharge))
                     {
                     {
                         if (linesInAirShower.ContainsKey(cur.Workshop) && linesInAirShower[cur.Workshop].Contains(cur.Name))
                         if (linesInAirShower.ContainsKey(cur.Workshop) && linesInAirShower[cur.Workshop].Contains(cur.Name))
                         {
                         {
@@ -264,7 +275,7 @@ namespace DeviceLibrary.manager
                             return true;
                             return true;
                         }
                         }
                     }
                     }
-                    else if(cur.Type.Equals(NodeType.Node) && next.Type.Equals(NodeType.Node))
+                    else if (cur.Type.Equals(NodeType.Node) && next.Type.Equals(NodeType.Node))
                     {
                     {
                         if (linesInAirShower.ContainsKey(cur.Workshop) && linesInAirShower.ContainsKey(next.Workshop))
                         if (linesInAirShower.ContainsKey(cur.Workshop) && linesInAirShower.ContainsKey(next.Workshop))
                         {
                         {