xu.lu пре 1 година
родитељ
комит
06c998996b
1 измењених фајлова са 158 додато и 158 уклоњено
  1. 158 158
      业务工程/分拣库/WCS.WorkEngineering/WorkStart.cs

+ 158 - 158
业务工程/分拣库/WCS.WorkEngineering/WorkStart.cs

@@ -330,7 +330,7 @@ namespace WCS.WorkEngineering
             {
                 new TrussSegmentInfo( 1, "10.30.37.211"),
                 new TrussSegmentInfo( 2, "10.30.37.217"),
-                //new TrussSegmentInfo( 3, "10.30.37.223")
+                new TrussSegmentInfo( 3, "10.30.37.223")
             };
 
             foreach (var item in TrussInfo)
@@ -347,7 +347,7 @@ namespace WCS.WorkEngineering
                 //桁架
                 new("10.30.37.211",new  List<int>(){1685,1686,1687,1688,1689,1690,1675,1674,1673,1672,1671,1670,1677,1678,1679,1680,1665,1664,1663,1662}), //分拣库一
                 new("10.30.37.217",new  List<int>(){1715,1716,1717,1718,1719,1720,1705,1704,1703,1702,1701,1700,1707,1708,1709,1710,1695,1694,1693,1692}), //分拣库二
-                //new("10.30.37.223",new  List<int>(){1745,1746,1747,1748,1749,1750,1735,1734,1733,1732,1731,1730,1737,1738,1739,1740,1725,1724,1723,1722}), //分拣库三
+                new("10.30.37.223",new  List<int>(){1745,1746,1747,1748,1749,1750,1735,1734,1733,1732,1731,1730,1737,1738,1739,1740,1725,1724,1723,1722}), //分拣库三
             };
 
             foreach (var item in tuples1)
@@ -375,8 +375,8 @@ namespace WCS.WorkEngineering
                 new("10.30.37.232",new  List<int>(){ 1681, 1676}), //库一南
                 new("10.30.37.234",new  List<int>(){ 1696, 1691}), //库二北
                 new("10.30.37.236",new  List<int>(){ 1711, 1706}), //库二南
-                //new("10.30.37.238",new  List<int>(){ 1726, 1721}), //库三北
-                //new("10.30.37.240",new  List<int>(){ 1736, 1741}), //库三南
+                new("10.30.37.238",new  List<int>(){ 1726, 1721}), //库三北
+                new("10.30.37.240",new  List<int>(){ 1736, 1741}), //库三南
             };
 
             foreach (var item in tuples21)
@@ -402,8 +402,8 @@ namespace WCS.WorkEngineering
                 new( 2, "10.30.37.232"),
                 new( 3, "10.30.37.234"),
                 new( 4, "10.30.37.236"),
-                //new( 5, "10.30.37.238"),
-                //new( 6, "10.30.37.240"),
+                new( 5, "10.30.37.238"),
+                new( 6, "10.30.37.240"),
             };
 
             foreach (var item in TrussInfo1)
@@ -421,7 +421,7 @@ namespace WCS.WorkEngineering
 
             int ip = 41;
 
-            for (int i = 0; i <= 3; i++)
+            for (int i = 0; i <= 5; i++)
             {
                 var srm = new Device($"SRM{i + 1}");
                 srm.AddFlag(DeviceFlags.堆垛机);
@@ -452,8 +452,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("SRM2", new string[] { "TY2" }),
                 new RouteInfo("SRM3", new string[] { "TY3" }),
                 new RouteInfo("SRM4", new string[] { "TY4" }),
-                //new RouteInfo("SRM5", new string[] { "TY5" }),
-                //new RouteInfo("SRM6", new string[] { "TY6" }),
+                new RouteInfo("SRM5", new string[] { "TY5" }),
+                new RouteInfo("SRM6", new string[] { "TY6" }),
 
                 #endregion 堆垛机--巷道
 
@@ -463,8 +463,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("TY2", new string[] { "2732","2734","2733" }),
                 new RouteInfo("TY3", new string[] { "2932","2934","2933" }), //人工取货口
                 new RouteInfo("TY4", new string[] { "3132","3134","3133" }),
-                //new RouteInfo("TY5", new string[] { "3332","3334","3333" }), //人工取货口
-                //new RouteInfo("TY6", new string[]{ "3532","3534","3533" }),
+                new RouteInfo("TY5", new string[] { "3332","3334","3333" }), //人工取货口
+                new RouteInfo("TY6", new string[]{ "3532","3534","3533" }),
 
                 #endregion 巷道--一楼堆垛机放货口
 
@@ -474,8 +474,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("TY2", new string[] { "1611","1615" }),
                 new RouteInfo("TY3", new string[] { "1621","1625" }),
                 new RouteInfo("TY4", new string[] { "1631","1635" }),
-                //new RouteInfo("TY5", new string[] { "1641","1645" }),
-                //new RouteInfo("TY6", new string[] { "1651","1655" }),
+                new RouteInfo("TY5", new string[] { "1641","1645" }),
+                new RouteInfo("TY6", new string[] { "1651","1655" }),
 
                 #endregion 巷道--二楼堆垛机放货口
 
@@ -492,10 +492,10 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1625", new string[] { "1626" }),//09拆盘机
                 new RouteInfo("1635", new string[] { "1636" }),
                 //////库三
-                //new RouteInfo("1641", new string[] { "1642" }),//非09拆盘机
-                //new RouteInfo("1651", new string[] { "1652"}),
-                //new RouteInfo("1645", new string[] { "1646" }),//09拆盘机
-                //new RouteInfo("1655", new string[] { "1656" }),
+                new RouteInfo("1641", new string[] { "1642" }),//非09拆盘机
+                new RouteInfo("1651", new string[] { "1652"}),
+                new RouteInfo("1645", new string[] { "1646" }),//09拆盘机
+                new RouteInfo("1655", new string[] { "1656" }),
 
                 #endregion 二楼堆垛机放货口--二楼拆盘机
 
@@ -512,10 +512,10 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1626", new string[] { "RGV3" }),//09拆盘机
                 new RouteInfo("1636", new string[] { "RGV4" }),
                 //////库三
-                //new RouteInfo("1642", new string[] { "RGV5" }),//非09拆盘机
-                //new RouteInfo("1652", new string[] { "RGV6"}),
-                //new RouteInfo("1646", new string[] { "RGV5" }),//09拆盘机
-                //new RouteInfo("1656", new string[] { "RGV6" }),
+                new RouteInfo("1642", new string[] { "RGV5" }),//非09拆盘机
+                new RouteInfo("1652", new string[] { "RGV6"}),
+                new RouteInfo("1646", new string[] { "RGV5" }),//09拆盘机
+                new RouteInfo("1656", new string[] { "RGV6" }),
 
                 #endregion 二楼拆盘机--RGV
 
@@ -532,10 +532,10 @@ namespace WCS.WorkEngineering
                 new RouteInfo("RGV4", new string[] { "1706","1711" }),
                 new RouteInfo("RGV4", new string[] { "1707","1708","1709","1710", "1715","1716","1717","1718","1719","1720" }),
                 //////库三
-                //new RouteInfo("RGV5", new string[] { "1721","1726" }),//北区机械臂码垛区
-                //new RouteInfo("RGV5", new string[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"}),//桁架北区码垛站台
-                //new RouteInfo("RGV6", new string[] { "1736","1741" }),
-                //new RouteInfo("RGV6", new string[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new RouteInfo("RGV5", new string[] { "1721","1726" }),//北区机械臂码垛区
+                new RouteInfo("RGV5", new string[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"}),//桁架北区码垛站台
+                new RouteInfo("RGV6", new string[] { "1736","1741" }),
+                new RouteInfo("RGV6", new string[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
 
                 #endregion RGV--码垛区域
 
@@ -552,10 +552,10 @@ namespace WCS.WorkEngineering
                 new RouteInfo("Robot4", new string[] { "1706" }),
                 new RouteInfo("Robot4", new string[] { "1711" }),
                 ////库三
-                //new RouteInfo("Robot5", new string[] { "1721" }),
-                //new RouteInfo("Robot5", new string[] { "1726" }),
-                //new RouteInfo("Robot6", new string[] { "1736" }),
-                //new RouteInfo("Robot6", new string[] { "1741" }),
+                new RouteInfo("Robot5", new string[] { "1721" }),
+                new RouteInfo("Robot5", new string[] { "1726" }),
+                new RouteInfo("Robot6", new string[] { "1736" }),
+                new RouteInfo("Robot6", new string[] { "1741" }),
 
                 #endregion Robot--码垛工位
 
@@ -569,8 +569,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("2732", new string[] { "TY2" }),
                 new RouteInfo("2932", new string[] { "TY3" }), //分拣库二
                 new RouteInfo("3132", new string[] { "TY4" }),
-                //new RouteInfo("3332", new string[] { "TY5" }), //分拣库三
-                //new RouteInfo("3532", new string[] { "TY6" }),
+                new RouteInfo("3332", new string[] { "TY5" }), //分拣库三
+                new RouteInfo("3532", new string[] { "TY6" }),
 
                 #endregion 一楼人工入库口-巷道
 
@@ -584,10 +584,10 @@ namespace WCS.WorkEngineering
                 new RouteInfo("2928", new string[] { "TY3" }),
                 new RouteInfo("3127", new string[] { "TY4" }),
                 new RouteInfo("3128", new string[] { "TY4" }),
-                //new RouteInfo("3327", new string[] { "TY5" }), //分拣库三
-                //new RouteInfo("3328", new string[] { "TY5" }),
-                //new RouteInfo("3527", new string[] { "TY6" }),
-                //new RouteInfo("3528", new string[] { "TY6" }),
+                new RouteInfo("3327", new string[] { "TY5" }), //分拣库三
+                new RouteInfo("3328", new string[] { "TY5" }),
+                new RouteInfo("3527", new string[] { "TY6" }),
+                new RouteInfo("3528", new string[] { "TY6" }),
 
                 #endregion 一楼叠盘机(堆垛机入口)--巷道
 
@@ -619,8 +619,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("122", new string[] { "618" }), //分拣库一南
                 new RouteInfo("41", new string[] { "818" }), //分拣库一北
                 new RouteInfo("141", new string[] { "1018" }), //分拣库一南
-                //new RouteInfo("61", new string[] { "1218" }), //分拣库一北
-                //new RouteInfo("161", new string[] { "1418" }), //分拣库一南
+                new RouteInfo("61", new string[] { "1218" }), //分拣库一北
+                new RouteInfo("161", new string[] { "1418" }), //分拣库一南
 
                 #endregion 主线分流点--环形库分流点
 
@@ -630,8 +630,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("618", new string[] { "624", "633", "642" }),
                 new RouteInfo("818", new string[] { "824","833","842" }),
                 new RouteInfo("1018", new string[] { "1024","1033","1042" }),
-                //new RouteInfo("1218", new string[] { "1224","1233","1242" }),
-                //new RouteInfo("1418", new string[] { "1424","1433","1442" }),
+                new RouteInfo("1218", new string[] { "1224","1233","1242" }),
+                new RouteInfo("1418", new string[] { "1424","1433","1442" }),
 
                 #endregion 环形库分流点--环形库取货点
 
@@ -641,8 +641,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("618", new string[] { "655" }), //分拣库一南
                 new RouteInfo("818", new string[] { "855" }), //分拣库二北
                 new RouteInfo("1018", new string[] { "1055" }), //分拣库二南
-                //new RouteInfo("1218", new string[] { "1255" }), //分拣库三北
-                //new RouteInfo("1418", new string[] { "1455" }), //分拣库三南
+                new RouteInfo("1218", new string[] { "1255" }), //分拣库三北
+                new RouteInfo("1418", new string[] { "1455" }), //分拣库三南
 
                 #endregion 环形库分流点--桁架分流点
 
@@ -652,8 +652,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("655", new string[] { "666","680","694","708", "722","736","750","764","778","791"}), //分拣库一南
                 new RouteInfo("855", new string[] { "866","880","894","908", "922","936","950","964","978","991"}), //分拣库二北
                 new RouteInfo("1055", new string[] { "1066","1080","1094","1108", "1122","1136","1150","1164","1178","1191"}), //分拣库二南
-                //new RouteInfo("1255", new string[] { "1266","1280","1294","1308", "1322","1336","1350","1364","1378", "1391"}), //分拣库三北
-                //new RouteInfo("1455", new string[] { "1466","1480","1494","1408", "1422","1436","1450","1464","1478","1591"}), //分拣库三南
+                new RouteInfo("1255", new string[] { "1266","1280","1294","1308", "1322","1336","1350","1364","1378", "1391"}), //分拣库三北
+                new RouteInfo("1455", new string[] { "1466","1480","1494","1408", "1422","1436","1450","1464","1478","1591"}), //分拣库三南
 
                 #endregion 桁架分流点--桁架缓存放行点
 
@@ -699,26 +699,26 @@ namespace WCS.WorkEngineering
                 new("1164", new[] { "1159" }),
                 new("1178", new[] { "1173" }),
                 new("1191", new[] { "1186" }),
-                //new("1266", new[] { "1261" }), //分拣三北侧
-                //new("1280", new[] { "1275" }),
-                //new("1294", new[] { "1289" }),
-                //new("1308", new[] { "1303" }),
-                //new("1322", new[] { "1317" }),
-                //new("1336", new[] { "1331" }),
-                //new("1350", new[] { "1345" }),
-                //new("1364", new[] { "1359" }),
-                //new("1378", new[] { "1373" }),
-                //new("1391", new[] { "1386" }),
-                //new("1466", new[] { "1461" }),//分拣三南侧
-                //new("1480", new[] { "1475" }),
-                //new("1494", new[] { "1489" }),
-                //new("1508", new[] { "1503" }),
-                //new("1522", new[] { "1517" }),
-                //new("1536", new[] { "1531" }),
-                //new("1550", new[] { "1545" }),
-                //new("1564", new[] { "1559" }),
-                //new("1578", new[] { "1573" }),
-                //new("1591", new[] { "1586" }),
+                new("1266", new[] { "1261" }), //分拣三北侧
+                new("1280", new[] { "1275" }),
+                new("1294", new[] { "1289" }),
+                new("1308", new[] { "1303" }),
+                new("1322", new[] { "1317" }),
+                new("1336", new[] { "1331" }),
+                new("1350", new[] { "1345" }),
+                new("1364", new[] { "1359" }),
+                new("1378", new[] { "1373" }),
+                new("1391", new[] { "1386" }),
+                new("1466", new[] { "1461" }),//分拣三南侧
+                new("1480", new[] { "1475" }),
+                new("1494", new[] { "1489" }),
+                new("1508", new[] { "1503" }),
+                new("1522", new[] { "1517" }),
+                new("1536", new[] { "1531" }),
+                new("1550", new[] { "1545" }),
+                new("1564", new[] { "1559" }),
+                new("1578", new[] { "1573" }),
+                new("1591", new[] { "1586" }),
 
                 #endregion 桁架缓存放行点--桁架取货点
 
@@ -764,26 +764,26 @@ namespace WCS.WorkEngineering
                 new("1159", new[] { "Truss2" }),
                 new("1173", new[] { "Truss2" }),
                 new("1186", new[] { "Truss2" }),
-                //new("1261", new[] { "Truss3" }), //分拣三北侧
-                //new("1275", new[] { "Truss3" }),
-                //new("1289", new[] { "Truss3" }),
-                //new("1303", new[] { "Truss3" }),
-                //new("1317", new[] { "Truss3" }),
-                //new("1331", new[] { "Truss3" }),
-                //new("1345", new[] { "Truss3" }),
-                //new("1359", new[] { "Truss3" }),
-                //new("1373", new[] { "Truss3" }),
-                //new("1386", new[] { "Truss3" }),
-                //new("1461", new[] { "Truss3" }),//分拣三南侧
-                //new("1475", new[] { "Truss3" }),
-                //new("1489", new[] { "Truss3" }),
-                //new("1503", new[] { "Truss3" }),
-                //new("1517", new[] { "Truss3" }),
-                //new("1531", new[] { "Truss3" }),
-                //new("1545", new[] { "Truss3" }),
-                //new("1559", new[] { "Truss3" }),
-                //new("1573", new[] { "Truss3" }),
-                //new("1586", new[] { "Truss3" }),
+                new("1261", new[] { "Truss3" }), //分拣三北侧
+                new("1275", new[] { "Truss3" }),
+                new("1289", new[] { "Truss3" }),
+                new("1303", new[] { "Truss3" }),
+                new("1317", new[] { "Truss3" }),
+                new("1331", new[] { "Truss3" }),
+                new("1345", new[] { "Truss3" }),
+                new("1359", new[] { "Truss3" }),
+                new("1373", new[] { "Truss3" }),
+                new("1386", new[] { "Truss3" }),
+                new("1461", new[] { "Truss3" }),//分拣三南侧
+                new("1475", new[] { "Truss3" }),
+                new("1489", new[] { "Truss3" }),
+                new("1503", new[] { "Truss3" }),
+                new("1517", new[] { "Truss3" }),
+                new("1531", new[] { "Truss3" }),
+                new("1545", new[] { "Truss3" }),
+                new("1559", new[] { "Truss3" }),
+                new("1573", new[] { "Truss3" }),
+                new("1586", new[] { "Truss3" }),
 
                 #endregion 桁架取货点--桁架
 
@@ -829,26 +829,26 @@ namespace WCS.WorkEngineering
                 new("1159", new[] { "1707","1708","1709","1710", "1715","1716","1717","1718","1719","1720" }),
                 new("1173", new[] { "1707","1708","1709","1710", "1715","1716","1717","1718","1719","1720" }),
                 new("1186", new[] { "1707","1708","1709","1710", "1715","1716","1717","1718","1719","1720" }),
-                //new("1261", new[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735" }), //分拣三北侧
-                //new("1275", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1289", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1303", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1317", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1331", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1345", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1359", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1373", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1386", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
-                //new("1461", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),//分拣三南侧
-                //new("1475", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1489", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1503", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1517", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1531", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1545", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1559", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1573", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
-                //new("1586", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1261", new[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735" }), //分拣三北侧
+                new("1275", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1289", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1303", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1317", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1331", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1345", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1359", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1373", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1386", new[] {"1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735"  }),
+                new("1461", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),//分拣三南侧
+                new("1475", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1489", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1503", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1517", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1531", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1545", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1559", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1573", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
+                new("1586", new[] { "1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750" }),
 
                 #endregion 桁架取货点--码垛工位
 
@@ -856,7 +856,7 @@ namespace WCS.WorkEngineering
 
                 new("Truss1", new[] { "1662","1663","1664","1665","1670","1671","1672","1673", "1674","1675","1677","1678","1679","1680", "1685","1686","1687","1688","1689","1690" }),
                 new("Truss2", new[] { "1692","1693","1694","1695", "1700","1701","1702","1703","1704","1705","1707","1708","1709","1710", "1715","1716","1717","1718","1719","1720" }),
-                //new("Truss3", new[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735","1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750"}),
+                new("Truss3", new[] { "1722","1723","1724","1725", "1730","1731","1732","1733","1734","1735","1737","1738","1739","1740", "1745","1746","1747","1748","1749","1750"}),
 
                 #endregion 桁架--码垛工位
 
@@ -916,31 +916,31 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1719", new string[] { "RGV4" }),
                 new RouteInfo("1720", new string[] { "RGV4" }),
                 ////分拣库三北
-                //new RouteInfo("1721", new string[] { "RGV5" }),//机械手码垛工位
-                //new RouteInfo("1726", new string[] { "RGV5" }),
-                //new RouteInfo("1722", new string[] { "RGV5" }),//绗架码垛工位
-                //new RouteInfo("1723", new string[] { "RGV5" }),
-                //new RouteInfo("1724", new string[] { "RGV5" }),
-                //new RouteInfo("1725", new string[] { "RGV5" }),
-                //new RouteInfo("1730", new string[] { "RGV5" }),
-                //new RouteInfo("1731", new string[] { "RGV5" }),
-                //new RouteInfo("1732", new string[] { "RGV5" }),
-                //new RouteInfo("1733", new string[] { "RGV5" }),
-                //new RouteInfo("1734", new string[] { "RGV5" }),
-                //new RouteInfo("1735", new string[] { "RGV5" }),
-                ////分拣库三南
-                //new RouteInfo("1736", new string[] { "RGV6" }),//机械手码垛工位
-                //new RouteInfo("1741", new string[] { "RGV6" }),
-                //new RouteInfo("1737", new string[] { "RGV6" }),//绗架码垛工位
-                //new RouteInfo("1738", new string[] { "RGV6" }),
-                //new RouteInfo("1739", new string[] { "RGV6" }),
-                //new RouteInfo("1740", new string[] { "RGV6" }),
-                //new RouteInfo("1745", new string[] { "RGV6" }),
-                //new RouteInfo("1746", new string[] { "RGV6" }),
-                //new RouteInfo("1747", new string[] { "RGV6" }),
-                //new RouteInfo("1748", new string[] { "RGV6" }),
-                //new RouteInfo("1749", new string[] { "RGV6" }),
-                //new RouteInfo("1750", new string[] { "RGV6" }),
+                new RouteInfo("1721", new string[] { "RGV5" }),//机械手码垛工位
+                new RouteInfo("1726", new string[] { "RGV5" }),
+                new RouteInfo("1722", new string[] { "RGV5" }),//绗架码垛工位
+                new RouteInfo("1723", new string[] { "RGV5" }),
+                new RouteInfo("1724", new string[] { "RGV5" }),
+                new RouteInfo("1725", new string[] { "RGV5" }),
+                new RouteInfo("1730", new string[] { "RGV5" }),
+                new RouteInfo("1731", new string[] { "RGV5" }),
+                new RouteInfo("1732", new string[] { "RGV5" }),
+                new RouteInfo("1733", new string[] { "RGV5" }),
+                new RouteInfo("1734", new string[] { "RGV5" }),
+                new RouteInfo("1735", new string[] { "RGV5" }),
+                //分拣库三南
+                new RouteInfo("1736", new string[] { "RGV6" }),//机械手码垛工位
+                new RouteInfo("1741", new string[] { "RGV6" }),
+                new RouteInfo("1737", new string[] { "RGV6" }),//绗架码垛工位
+                new RouteInfo("1738", new string[] { "RGV6" }),
+                new RouteInfo("1739", new string[] { "RGV6" }),
+                new RouteInfo("1740", new string[] { "RGV6" }),
+                new RouteInfo("1745", new string[] { "RGV6" }),
+                new RouteInfo("1746", new string[] { "RGV6" }),
+                new RouteInfo("1747", new string[] { "RGV6" }),
+                new RouteInfo("1748", new string[] { "RGV6" }),
+                new RouteInfo("1749", new string[] { "RGV6" }),
+                new RouteInfo("1750", new string[] { "RGV6" }),
 
                 #endregion 码垛工位--RGV
 
@@ -950,8 +950,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("RGV2", new string[] { "1614" }),
                 new RouteInfo("RGV3", new string[] { "1624" }),
                 new RouteInfo("RGV4", new string[] { "1634" }),
-                //new RouteInfo("RGV5", new string[] { "1644" }),
-                //new RouteInfo("RGV6", new string[] { "1654" }),
+                new RouteInfo("RGV5", new string[] { "1644" }),
+                new RouteInfo("RGV6", new string[] { "1654" }),
 
                 #endregion RGV--RGV放货点
 
@@ -961,8 +961,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1614", new string[] { "1613" }),//南侧
                 new RouteInfo("1624", new string[] { "1623" }),//北侧
                 new RouteInfo("1634", new string[] { "1633" }),//南侧
-                //new RouteInfo("1644", new string[] { "1643" }),//北侧
-                //new RouteInfo("1654", new string[] { "1653" }),//南侧
+                new RouteInfo("1644", new string[] { "1643" }),//北侧
+                new RouteInfo("1654", new string[] { "1653" }),//南侧
 
                 #endregion RGV放货点--堆垛机取货口
 
@@ -972,8 +972,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1613", new string[] { "TY2" }),//南侧
                 new RouteInfo("1623", new string[] { "TY3" }),//北侧
                 new RouteInfo("1633", new string[] { "TY4" }),//南侧
-                //new RouteInfo("1643", new string[] { "TY5" }),//北侧
-                //new RouteInfo("1653", new string[] { "TY6" }),//南侧
+                new RouteInfo("1643", new string[] { "TY5" }),//北侧
+                new RouteInfo("1653", new string[] { "TY6" }),//南侧
 
                 #endregion 二楼堆垛机入库--巷道
 
@@ -983,8 +983,8 @@ namespace WCS.WorkEngineering
                 new RouteInfo("TY2", new string[] { "SRM2" }),
                 new RouteInfo("TY3", new string[] { "SRM3" }),
                 new RouteInfo("TY4", new string[] { "SRM4" }),
-                //new RouteInfo("TY5", new string[] { "SRM5" }),
-                //new RouteInfo("TY6", new string[] { "SRM6" }),
+                new RouteInfo("TY5", new string[] { "SRM5" }),
+                new RouteInfo("TY6", new string[] { "SRM6" }),
 
                 #endregion 巷道--堆垛机
 
@@ -1002,12 +1002,12 @@ namespace WCS.WorkEngineering
                 new RouteInfo("1024", new string[] { "Robot4" }),
                 new RouteInfo("1033", new string[] { "Robot4" }),
                 new RouteInfo("1042", new string[] { "Robot4" }),
-                //new RouteInfo("1224", new string[] { "Robot5" }),
-                //new RouteInfo("1233", new string[] { "Robot5" }),
-                //new RouteInfo("1242", new string[] { "Robot5" }),
-                //new RouteInfo("1424", new string[] { "Robot6" }),
-                //new RouteInfo("1433", new string[] { "Robot6" }),
-                //new RouteInfo("1442", new string[] { "Robot6" })
+                new RouteInfo("1224", new string[] { "Robot5" }),
+                new RouteInfo("1233", new string[] { "Robot5" }),
+                new RouteInfo("1242", new string[] { "Robot5" }),
+                new RouteInfo("1424", new string[] { "Robot6" }),
+                new RouteInfo("1433", new string[] { "Robot6" }),
+                new RouteInfo("1442", new string[] { "Robot6" })
 
                 #endregion 线体取货位--Robot
 
@@ -1055,13 +1055,13 @@ namespace WCS.WorkEngineering
                 new("1033",new List<string> {"1033","1034"}),
                 new("1024",new List<string> {"1024","1025"}),
                 ////环形库三北侧机械手取货位
-                //new("1224",new List<string> {"1224","1225"}),
-                //new("1233",new List<string> {"1233","1234"}),
-                //new("1242",new List<string> {"1242","1243"}),
+                new("1224",new List<string> {"1224","1225"}),
+                new("1233",new List<string> {"1233","1234"}),
+                new("1242",new List<string> {"1242","1243"}),
                 ////环形库三南侧侧机械手取货位
-                //new("1442",new List<string> {"1442","1443"}),
-                //new("1433",new List<string> {"1433","1434"}),
-                //new("1424",new List<string> {"1424","1425"}),
+                new("1442",new List<string> {"1442","1443"}),
+                new("1433",new List<string> {"1433","1434"}),
+                new("1424",new List<string> {"1424","1425"}),
             };
             Parallel.ForEach(tuples2, tuple =>
             {
@@ -1078,15 +1078,15 @@ namespace WCS.WorkEngineering
                 { DeviceFlags.入库, new List<string>() { "2532", "2533", "2534", "2732", "2733", "2734"/*,"1603"*/ } },
                 { DeviceFlags.出库, new List<string>() { "2532", "2533", "2534", "2732", "2733", "2734" } },
                 { DeviceFlags.扫码, new List<string>() { "2532", "2732" } },
-                { DeviceFlags.一楼扫码,new List<string>(){ "2532","2732", "2932", "3132"/*, "3332", "3532"*/ } },
-                { DeviceFlags.一楼叠盘机,new List<string>() { "2527", "2528", "2727", "2728", "2927", "2928", "3127", "3128"/*, "3327", "3328", "3527", "3528"*/ } },
+                { DeviceFlags.一楼扫码,new List<string>(){ "2532","2732", "2932", "3132", "3332", "3532" } },
+                { DeviceFlags.一楼叠盘机,new List<string>() { "2527", "2528", "2727", "2728", "2927", "2928", "3127", "3128", "3327", "3328", "3527", "3528" } },
                 { DeviceFlags.主线分流点,new List<string>() { "22","41","61"} },
                 { DeviceFlags.满轮主线第一次扫码,new List<string>() { "1"} },
-                { DeviceFlags.环形库分流点,new List<string>(){ "418", "618", "818", "1018"/*, "1218", "1418"*/ } },
-                { DeviceFlags.桁架分流点,new List<string>() { "455", "655", "855", "1055"/*, "1255", "1455"*/ } },
+                { DeviceFlags.环形库分流点,new List<string>(){ "418", "618", "818", "1018", "1218", "1418" } },
+                { DeviceFlags.桁架分流点,new List<string>() { "455", "655", "855", "1055", "1255", "1455" } },
                 { DeviceFlags.桁架缓存放行点, new List<string>(){ "466", "480", "494", "508", "522", "536", "550", "564", "578", "591", "666", "680", "694", "708", "722", "736", "750", "764", "778", "791",
-                    "866", "880", "894", "908", "922", "936", "950", "964", "978", "991", "1066", "1080", "1094", "1108", "1122", "1136", "1150", "1164", "1178", "1191"/*,
-                    "1266", "1280", "1294", "1308", "1322", "1336", "1350", "1364", "1378", "1391", "1466", "1480", "1494", "1408", "1422", "1436", "1450", "1464", "1478", "1591" */} },
+                    "866", "880", "894", "908", "922", "936", "950", "964", "978", "991", "1066", "1080", "1094", "1108", "1122", "1136", "1150", "1164", "1178", "1191",
+                    "1266", "1280", "1294", "1308", "1322", "1336", "1350", "1364", "1378", "1391", "1466", "1480", "1494", "1408", "1422", "1436", "1450", "1464", "1478", "1591"} },
                 { DeviceFlags.桁架09缓存放行点, new List<string>(){ "466", "480", "494", "508", "522", "536", "666", "680", "694", "708", "722", "736"
                     , "866", "880", "894", "908", "922", "936", "1066", "1080", "1094", "1108", "1122", "1136",
                      "1266", "1280", "1294", "1308", "1322", "1336",  "1466", "1480", "1494", "1408", "1422", "1436" } },
@@ -1100,9 +1100,9 @@ namespace WCS.WorkEngineering
                 { DeviceFlags.桁架码垛位, new List<string>(){ /*"1670", "1671",*/ "1672", "1673", "1674", "1675", "1664","1662","1663","1665","1677","1678","1679","1680",/*"1685","1686",*/"1687","1688","1689",
                     "1690", "1692", "1693", "1694", "1695", "1700", "1701", "1702", "1703", "1704", "1705", "1707", "1708", "1709", "1710", "1715", "1716", "1717", "1718", "1719", "1720", "1722", "1723", "1724", "1725", "1730", "1731", "1732", "1733", "1734", "1735", "1737", "1738", "1739", "1740", "1745", "1746", "1747", "1748", "1749", "1750" } },
                 { DeviceFlags.环形库码垛工位, new List<string>(){ "1666", "1661", "1676", "1681", "1691", "1696", "1706", "1711"/*, "1721", "1726", "1736", "1741"*/ } },
-                { DeviceFlags.AGV取货站台口, new List<string>(){ "2533", "2534", "2734", "2733","2934","2933","3133", "3134"/*,"3333","3334","3533","3534" */} },
-                { DeviceFlags.Robot, new List<string>(){ "Robot1", "Robot2", "Robot3", "Robot4"/* , "Robot5", "Robot6"*/ } },
-                {DeviceFlags.二次码垛RGV取货口, new List<string>(){ "1606", "1616", "1626","1636"/*,"1646","1656"*/}}
+                { DeviceFlags.AGV取货站台口, new List<string>(){ "2533", "2534", "2734", "2733","2934","2933","3133", "3134","3333","3334","3533","3534"} },
+                { DeviceFlags.Robot, new List<string>(){ "Robot1", "Robot2", "Robot3", "Robot4" , "Robot5", "Robot6" } },
+                {DeviceFlags.二次码垛RGV取货口, new List<string>(){ "1606", "1616", "1626","1636","1646","1656"}}
         };
 
             Parallel.ForEach(devices, device =>