fix

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

@@ -98,6 +98,8 @@ namespace WCS.Service
                 Device.AddFlag(DF.月台, "G1469", "G1561", "G1538", "G1574", "G1509");
                 Device.AddFlag(DF.SRM二级品取货, "1040", "1041", "1042", "1043", "1049", "1050", "1051", "1052");
                 Device.AddFlag(DF.SRM二级品取货, "1058", "1059", "1060", "1061", "1067", "1068");
+                Device.AddFlag(DF.SRMBOPP取货, "1195", "1194", "1193", "1192", "1204", "1203", "1202", "1201");
+                Device.AddFlag(DF.SRMBOPP取货, "1213", "1212", "1210", "1211", "1220", "1219", "1230", "1228");
                 Device.AddFlag(DF.SRM月台放货, "1473", "1476", "1474", "1475", "1491", "1492", "1493", "1494");
                 Device.AddFlag(DF.SRM月台放货, "1520", "1521", "1522", "1523", "1545", "1546", "1451", "1453");
                 Device.AddFlag(DF.SRM涂布取货, "1428", "1429", "1422", "1423", "1424", "1425", "1415", "1416");

Projects/永冠OPP/WCS.Service/Works/Station/BOPP入库.cs

@@ -132,7 +132,7 @@ namespace WCS.Service.Works.Station
                     foreach (var item in tunnels)
                     {
                         //当前巷道的取货点
-                        var allIn = Device.Where(v => v.Is(DF.SRM二级品取货)) //一楼所有取货点
+                        var allIn = Device.Where(v => v.Is(DF.SRMBOPP取货)) //一楼所有取货点
                                           .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
                                           .Select(v => v.CODE)
                                           .ToList();
@@ -147,7 +147,7 @@ namespace WCS.Service.Works.Station
                         if (putStation == null) continue;
                         var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == putStation.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
                         //RGV是否有正在前往这个地址的任务
-                        var rgvList = Device.Where(v => v.Is(DF.涂布RGV)).Select(v => v.Create<RGVDevice>());
+                        var rgvList = Device.Where(v => v.Is(DF.BOPPRGV)).Select(v => v.Create<RGVDevice>());
                         if (rgvList.Any(v => (!v.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲) || !v.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动))
                                             && v.Data2.TaskType_1 == WCS.Entity.Protocol.RGV.RGVTaskType.放货
                                             && v.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort())) continue;
@@ -243,7 +243,7 @@ namespace WCS.Service.Works.Station
                     foreach (var item in tunnels)
                     {
                         //当前巷道的取货点
-                        var allIn = Device.Where(v => v.Is(DF.SRM涂布取货)) //一楼所有取货点
+                        var allIn = Device.Where(v => v.Is(DF.SRMBOPP取货)) //一楼所有取货点
                                           .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
                                           .Select(v => v.CODE)
                                           .ToList();

WCS.Core/Device.cs

@@ -175,4 +175,5 @@ public enum DF
     涂布RGV取货站台 = 1 << 13,
     BOPPRGV取货设备组 = 1 << 14,
     BOPPRGV放货设备组 = 1 << 15,
+    SRMBOPP取货 = 1 << 16,
 }