update:优化涂布入库

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

@@ -425,7 +425,7 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public StationDeviceGroup CurrentStation()
         {
-            return LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)&& v.Entity.Is(DF.涂布RGV放货设备组)).Where(v =>
+            return LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)|| v.Entity.Is(DF.涂布RGV放货设备组)).Where(v =>
               {
                   //RGV与站台距离误差为 正负50500
                   var max = v.Position + 500;

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

@@ -168,16 +168,16 @@ namespace WCS.Service.Works.RGV
                         obj.Move(beforeSickStation);
                         return;
                     }
-
+                    return;
                 }
                 
 
                 //此时RGV即没有等待执行的放货任务，也不在任何一个取货点,因此需要调往最近的一个取货点
                 //找到距离这个RGV最近的一个取货点
                 //必须所有RGV都是空闲状态时才可以进行初始化
-                if (obj.RGVList.Any(v => v.Data2.SystemStatus != RGVRunStatus.空闲 || v.Data2.WorkMode != RGVMode.自动)) return;
-                pickStation = obj.BeforeStation();
-                obj.Move(pickStation);
+                //if (obj.RGVList.Any(v => v.Data2.SystemStatus != RGVRunStatus.空闲 || v.Data2.WorkMode != RGVMode.自动)) return;
+                //pickStation = obj.BeforeStation();
+                //obj.Move(pickStation);
             });
         }
 

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

@@ -147,6 +147,7 @@ namespace WCS.Service.Works.Station
                     {
                         var dev = Device.Find(item.Entity.CODE).Create<StationDevice>();
                         var task = tasks.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
+                        if (task == null) throw new WarnException($"WCS无该任务{dev.Data2.Tasknum}--{dev.Entity.CODE}");
 
                         task.DEVICE = tunnelInfo.SRM.Entity.CODE;
                         task.TUNNEL = tunnelInfo.Tunnel.CODE;