init BOPP环穿

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -1009,18 +1009,18 @@ namespace WCS.Service.Extensions
                 new StationLocation("G9",1256875,"RGV3",1567770),
                 new StationLocation("G10",1313239,"RGV3",1567770),
                 new StationLocation("G11",1369970,"RGV3",1567770),
-                //new StationLocation("G12",636770,"RGV1",3000000),
-                //new StationLocation("G13",749520,"RGV1",3000000),
-                //new StationLocation("G14",879930,"RGV1",3000000),
-                //new StationLocation("G15",936310,"RGV1",3000000),
-                //new StationLocation("G16",988000,"RGV1",3000000),
-                //new StationLocation("G17",2335849,"RGV1",3000000),
-                //new StationLocation("G18",2415849,"RGV1",3000000),
-                //new StationLocation("G19",2495849,"RGV1",3000000),
-                //new StationLocation("G20",2548012,"RGV1",3000000),
-                //new StationLocation("G21",2606033,"RGV1",3000000),
-                //new StationLocation("G22",2660833,"RGV1",3000000),
-                //new StationLocation("G23",2715603,"RGV1",3000000),
+                new StationLocation("G12",636770,"RGV1",3000000),
+                new StationLocation("G13",749520,"RGV1",3000000),
+                new StationLocation("G14",879930,"RGV1",3000000),
+                new StationLocation("G15",936310,"RGV1",3000000),
+                new StationLocation("G16",988000,"RGV1",3000000),
+                new StationLocation("G17",2335849,"RGV1",3000000),
+                new StationLocation("G18",2415849,"RGV1",3000000),
+                new StationLocation("G19",2495849,"RGV1",3000000),
+                new StationLocation("G20",2548012,"RGV1",3000000),
+                new StationLocation("G21",2606033,"RGV1",3000000),
+                new StationLocation("G22",2660833,"RGV1",3000000),
+                new StationLocation("G23",2715603,"RGV1",3000000),
             });
         }
 

Projects/永冠OPP/WCS.Service/Worker.cs

@@ -107,13 +107,15 @@ namespace WCS.Service
                 Device.AddFlag(DF.涂布RGV, "RGV9", "RGV10", "RGV11", "RGV12", "RGV13", "RGV14");
                 Device.AddFlag(DF.涂布RGV取货设备组, "G2", "G3", "G5", "G7", "G9", "G11");
                 Device.AddFlag(DF.涂布RGV放货设备组, "G1", "G4", "G6", "G8", "G10");
-                Device.AddFlag(DF.拉膜RGV, "RGV1", "RGV2", "RGV3", "RGV4", "RGV5", "RGV6", "RGV7");
                 //Device.AddFlag(DF.涂布出库取货站台, "G5", "G7", "G9", "G11");
                 //Device.AddFlag(DF.涂布入库取货站台, "G2", "G3");
                 Device.AddFlag(DF.涂布出库RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
                 Device.AddFlag(DF.涂布入库RGV取货站台, "1391", "1392", "1399", "1400");
                 Device.AddFlag(DF.涂布RGV取货站台, "1285", "1286", "1294", "1295", "1303", "1304", "1312", "1313");
                 Device.AddFlag(DF.涂布RGV取货站台, "1391", "1392", "1399", "1400");
+                Device.AddFlag(DF.BOPPRGV, "RGV1", "RGV2", "RGV3", "RGV4", "RGV5", "RGV6", "RGV7");
+                Device.AddFlag(DF.BOPPRGV取货设备组, "G17", "G18", "G19", "G20", "G21", "G22", "G23");
+                Device.AddFlag(DF.BOPPRGV放货设备组, "G12", "G13", "G14", "G15", "G16");
 
                 #endregion 设备扩展数据配置
 

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -217,7 +217,7 @@ namespace WCS.Service.Works.RGV
         }
     }
 
-    //[WorkTitle(typeof(RGVHandler), "BOPP环穿")]
+    [WorkTitle(typeof(RGVHandler), "BOPP环穿")]
     public class BOPP环穿 : DeviceWork<RGVDevice>
     {
         protected override void Do(RGVDevice obj)
@@ -304,7 +304,7 @@ namespace WCS.Service.Works.RGV
                         if (obj.StopedByMe(afterStation))
                         {
                             //找到当前所在站台的下一个取货点
-                            var beforeStation = Device.Where(v => v.Is(DF.涂布RGV取货设备组) && v.CODE != pickStation.Entity.CODE)
+                            var beforeStation = Device.Where(v => v.Is(DF.BOPPRGV取货设备组) && v.CODE != pickStation.Entity.CODE)
                                           .Select(v => v.Create<StationDeviceGroup>())
                                           .OrderBy(v => pickStation.Distance(v))
                                           .FirstOrDefault();
@@ -325,7 +325,7 @@ namespace WCS.Service.Works.RGV
                     }
 
                     //是否在一个放货站台
-                    if (pickStation.Entity.Is(DF.涂布RGV放货设备组))
+                    if (pickStation.Entity.Is(DF.BOPPRGV放货设备组))
                     {
                         pickStation = obj.BeforeStation();
                         obj.Move(pickStation);
@@ -344,7 +344,7 @@ namespace WCS.Service.Works.RGV
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.Is(DF.拉膜RGV);
+            return dev.Is(DF.BOPPRGV);
         }
     }
 }

WCS.Core/Device.cs

@@ -166,12 +166,13 @@ public enum DF
     一楼RGV放货 = 1 << 4,
     月台 = 1 << 5,
     涂布RGV = 1 << 6,
-    拉膜RGV = 1 << 7,
+    BOPPRGV = 1 << 7,
     涂布RGV取货设备组 = 1 << 8,
     涂布RGV放货设备组 = 1 << 9,
     涂布出库RGV取货站台 = 1 << 10,
     涂布入库RGV取货站台 = 1 << 11,
     SRM涂布放货 = 1 << 12,
     涂布RGV取货站台 = 1 << 13,
-    备用9 = 1 << 14,
+    BOPPRGV取货设备组 = 1 << 14,
+    BOPPRGV放货设备组 = 1 << 14,
 }