Browse Source

update:涂布入库想到分配新增RGV判断

林豪 左 3 years ago
parent
commit
520b68fd37
1 changed files with 6 additions and 6 deletions
  1. 6 6
      Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

+ 6 - 6
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -248,17 +248,17 @@ namespace WCS.Service.Works.Station
                                       .Distinct()
                                       .FirstOrDefault();//去一次重
                         if (rgvDeliveryPoint == null) continue;
-                        var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
+                        var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
 
-                        //var rgvlIST = Device.Find(RGV8).Create<RGVDevice>();
-                        //if (!rgv8.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲)
-                        //  && !rgv8.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动)
-                        //  && rgv8.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort()) continue;
+                        var rgvList = Device.Where(v => v.Is(DF.涂布RGV)).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.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort())) continue;
 
                         tunnelInfos.Add(new TunnelInfo
                         {
                             Tunnel = item,
-                            taskIN = dev, //找到放货点设备所在组
+                            taskIN = taskInStation, //找到放货点设备所在组
                             SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
                         });
                     }