Merge branch '分拣库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 分拣库

YWGC/FJK/WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -284,6 +284,7 @@ namespace WCS.WorkEngineering.Systems
                                                         x.Data3.Status.HasFlag(StationStatus.Auto)).OrderBy(v => allPositionList.Contains(v.Entity.Code)).ToList();
                                                     if (!devs.Any()) //自身所属位置无可用放货点
                                                     {
+                                                        throw new Exception($"当前任务{agv.ID}无可用站台");
                                                         if (devsNear.Any())//先判断同库一侧
                                                         {
                                                             foreach (var dev in devsNear)

YWGC/FJK/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -547,7 +547,14 @@ namespace WCS.WorkEngineering.Systems
                     v.Status < AGVTaskStatus.Complete1 &&
                     v.TaskType == AGVTaskType.EnterDepot && v.Station == sta)
                 .SplitTable(v => v.Take(2)).Count();
-            if (n > 5)
+            //任务数量配置
+            int num = 5;
+            var config = db.Default.Queryable<fjSysConfig>().NoLock().First(x => x.Code == "SameSideTaskNum");
+            if (config != null)
+            {
+                num = config.SContent.ToInt();
+            }
+            if (n > num)
             {
                 sta = db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status >= AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.Complete1 && v.TaskType == AGVTaskType.EnterDepot
                 && (v.Station != "2533" && v.Station != "2933" && !v.Station.StartsWith("9")))//过滤掉人工满托入库和重绕区任务