fix

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

@@ -141,9 +141,12 @@ namespace WCS.Service.Extensions
         public bool IsPickUp(RGVDevice rgvDevice)
         {
             if (Entity.CODE is "G2" or "G3") return true;
-            var dCount = Device.Where(v => v.CODE is "G1" or "G1340" or "G1337").Select(v => v.Create<StationDeviceGroup>())
-                .Count(v => v.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000
-                && v.Data3.Status.HasFlag(StationStatus.自动)));
+            var dCount = Device.Where(v => v.CODE is "G1" or "G1340" or "G1337").Select(v => v.Create<StationDeviceGroup>()).Count(v =>
+            {
+                var count = v.Items.Count(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位) && !v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum < 10000
+                  && v.Data3.Status.HasFlag(StationStatus.自动));
+                return count == 2 ? true : false;
+            });
             var rCount = rgvDevice.RGVList.Count(v => v.Data.DestPosition_1 == 1);
             return rCount < dCount;
         }
@@ -1127,4 +1130,4 @@ namespace WCS.Service.Extensions
         public WCS_DEVICE taskIN;
         public Device<ISRM520, ISRM521, ISRM537> SRM;
     }
-}
+}

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

@@ -7,6 +7,7 @@ using WCS.Entity;
 using WCS.Entity.Protocol.RGV;
 using WCS.Service.Extensions;
 using WCS.Service.Handlers;
+using WCS.Service.Log;
 
 namespace WCS.Service.Works.RGV
 {
@@ -152,10 +153,13 @@ namespace WCS.Service.Works.RGV
                                 {
                                     if (gw1.Data2.Goodsend != gw2.Data2.Goodsend) throw new WarnException($"{rgvDevice.Entity.CODE}目标地址不一致");
                                 }
+
+                                InfoLog.INFO_RGVINFO($"[{rgvDevice.Entity.CODE}]--写入RGV取货任务-开始:{rgvDevice.Data.TaskID_1},{rgvDevice.Data.TaskID_2},{rgvDevice.Data.TaskType_1},{rgvDevice.Data.DestPosition_1},{rgvDevice.Data.Trigger_1}");
                                 rgvDevice.Data.TaskID_1 = gw1.Data2.Tasknum;
                                 rgvDevice.Data.TaskID_2 = gw2.Data2.Tasknum;
                                 rgvDevice.Data.TaskType_1 = RGVTaskType.取货;
                                 rgvDevice.Data.DestPosition_1 = pickStation.Entity.CODE.Replace("G", "").ToShort();
+                                InfoLog.INFO_RGVINFO($"[{rgvDevice.Entity.CODE}]--写入RGV取货任务-开始:{rgvDevice.Data.TaskID_1},{rgvDevice.Data.TaskID_2},{rgvDevice.Data.TaskType_1},{rgvDevice.Data.DestPosition_1},{rgvDevice.Data.Trigger_1}");
 
                                 rgvDevice.Data.Trigger_1++;
 
@@ -405,4 +409,4 @@ namespace WCS.Service.Works.RGV
             return dev.Is(DF.BOPPRGV);
         }
     }
-}
+}