fix

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

@@ -209,7 +209,7 @@ namespace WCS.Service.Extensions
                 }
                 if (dev.Data2.Request != IstationRequest.请求分配目标地址)
                 {
-                    InfoLog.INFO_WarnDb($"{dev.Entity.CODE}--有光电没有分配目标地址请求--2", Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
+                    InfoLog.INFO_INFO($"{dev.Entity.CODE}--有光电没有分配目标地址请求--2");
                     continue;
                 };
                 if (dev.Data2.Tasknum < 10000)

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -346,9 +346,15 @@ namespace WCS.Service.Works.SRM
                     {
                         //获取当前堆垛机未执行的任务
                         var taskList = db.Default.Set<WCS_TASK>().Where(v => v.DEVICE == srmDevice.Entity.CODE && v.TYPE == TaskType.移库 && v.STATUS < TaskStatus.堆垛机执行).OrderBy(p => p.CREATETIME);
-                        //通过任务的组ID找到本组的所有任务
-                        var tasks = taskList.ToList().GetOutTask();
 
+                        var tasks = taskList.ToList().GetOutTask();
+                        if (tasks.Any(v => v.Layer <= 6))
+                        {
+                            if (tasks.Count(v => v.Layer <= 6) >= 2)
+                            {
+                                tasks = tasks.Take(1).ToArray();
+                            }
+                        }
                         for (var i = 0; i < tasks.Length; i++)
                         {
                             var item = tasks[i];

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

@@ -193,7 +193,7 @@ namespace WCS.Service.Works.Station
                     }
                     //筛选出优先级最高的可用巷道
                     var tunnelInfo = tunnelInfos.Where(v => { try { return (v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程) || v.SRM.Entity.CODE == "SRM1"; } catch { return false; } }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
-                        
+
                     if (tunnelInfo == null) throw new WarnException("无可用巷道");
 
                     //开始变更任务信息
@@ -222,7 +222,11 @@ namespace WCS.Service.Works.Station
                     foreach (var finishTask in finishTaskList)
                     {
                         var task = db.Default.Set<WCS_TASK>().Find(finishTask.FinishCode);
-                        if (task == null) continue;
+                        if (task == null)
+                        {
+                            InfoLog.INFO_WarnDb($"WCS未找到任务{finishTask.FinishCode}", finishTask.Station.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
+                            continue;
+                        }
                         finishTask.Station.Data.Tasknum = task.ID;
                         finishTask.Station.Data.Goodsstart = stationDeviceGroup.Entity.CODE.Replace("G", "").ToShort();
                         finishTask.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();