Merge branch '环穿' of zuolinhao/YG-OPP-WCS into master

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

@@ -158,9 +158,11 @@ namespace WCS.Service.Works.Station
                         var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).MinBy(p => p.CODE);
                         //RGV是否有正在前往这个地址的任务
                         var rgvList = Device.Where(v => v.Is(DF.BOPPRGV)).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.自动))
+
+                        var rgvTaskCount = ProtocolProxy.YGWMS150Redis.Get("BoppRgvTaskCount").ToInt();
+                        if (rgvList.Count(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;
+                                            && v.Data2.DestPosition_1 == taskInStation?.CODE.Replace("G", "").ToShort())>rgvTaskCount) continue;
                         tunnelInfos.Add(new TunnelInfo
                         {
                             Tunnel = item,
@@ -285,7 +287,7 @@ namespace WCS.Service.Works.Station
                         try
                         {
                             code.infolog($"SCAlarm:{v.SRM.Data3.SCAlarm};SRMMode:{v.SRM.Data2.SRMMode};SRMStatus:{v.SRM.Data2.SRMStatus};CODE:{v.SRM.Entity.CODE}");
-                            return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲;
+                            return (v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲)||v.SRM.Entity.CODE=="SRM1" || v.SRM.Entity.CODE == "SRM2";
                         }
                         catch { return false; }
                     }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));

WCS.Core/DataTrans/DataBlock.cs

@@ -39,7 +39,7 @@ namespace WCS.Core
             {
                 if (Entity.NOUPDATE && Data != null)
                     return;
-                if (failed && (DateTime.Now - AliveTime).TotalMilliseconds < 3000)
+                if (failed && (DateTime.Now - AliveTime).TotalMilliseconds < 6000)
                 {
                     throw new Exception(Entity.NAME + "连接失败");
                 }