Administrator 3 år sedan
förälder
incheckning
9715c8e996

+ 1 - 1
Projects/永冠OPP/WCS.Service/DeviceExtentions.cs

@@ -59,7 +59,7 @@ namespace WCS.Service
         /// <returns></returns>
         public static WCS_DEVICE GetPath(this WCS_DEVICE source, string endAddr)
         {
-            var q = source.PATHS.Where(v => v.START == source && v.END.CODE.Contains(endAddr.ToUpper()))
+            var q = source.PATHS.Where(v => v.START == source && v.END != null && v.END.CODE.Contains(endAddr.ToUpper()))
                 .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
 
             return q.FirstOrDefault().FirstOrDefault();

+ 1 - 1
Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -392,7 +392,7 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public StationDeviceGroup BeforeStation()
         {
-            return LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货站台)).OrderBy(v => Distance(v)).FirstOrDefault();
+            return LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)).OrderBy(v => Distance(v)).FirstOrDefault();
         }
 
         /// <summary>

+ 1 - 1
Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -121,7 +121,7 @@ namespace WCS.Service.Works.Station
                                           .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
                                           .Select(v => v.CODE)
                                           .ToList();
-                        var q = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => allIn.Contains(p.NEXT.CODE))) //下一个目标地址包含取货点的设备
+                        var q = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE))) //下一个目标地址包含取货点的设备
                                       .Select(v => v.Create<StationDevice>()) //取所有可以到达取货点设备的信息
                                       .Where(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000)//筛选出空闲的路径点,此处因输送机都是一个动力,因此可以先找路径点再找设备组
                                       .Distinct()