fix

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

@@ -14,8 +14,8 @@ using WCS.Service.Log;
 
 namespace WCS.Service.Works.Station
 {
-    [WorkTitle(typeof(ProductHandler), "一楼入库扫码")]
-    internal class 一楼入库 : Work<StationDeviceGroup>
+    [WorkTitle(typeof(ProductHandler), "扫码入库")]
+    internal class 扫码入库 : Work<StationDeviceGroup>
     {
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
@@ -156,9 +156,8 @@ namespace WCS.Service.Works.Station
                         var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == putStation.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
                         //RGV是否有正在前往这个地址的任务
                         var rgv8 = 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;
+                        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;
                         tunnelInfos.Add(new TunnelInfo
                         {
                             Tunnel = item,

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

@@ -306,10 +306,9 @@ namespace WCS.Service.Works.Station
                             var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
                             //RGV是否有正在前往这个地址的任务
                             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.TaskType_1 == WCS.Entity.Protocol.RGV.RGVTaskType.放货
-                                              && v.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort())) continue;
+                            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;
 
                             tunnelInfos.Add(new TunnelInfo
                             {