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

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

@@ -170,6 +170,15 @@ namespace WCS.WorkEngineering.Systems
                                         //人工满托入库
                                         if (agv.TaskType == AGVTaskType.EnterDepot &&(agv.Station == "2535" || agv.Station == "2935" || agv.Station == "2735" || agv.Station == "3135"))
                                         {
+                                            fjSysConfig config = new fjSysConfig();
+                                            var config1 = db.Default.Queryable<fjSysConfig>().NoLock().First(x => x.Code == "FullPalletInMax");
+                                            if (config1 != null)
+                                            {
+                                                if (!(db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status < TaskStatus.Finish && x.BusType == "人工满托入库").Count() < config.SContent.ToShort()))
+                                                {
+                                                    throw new Exception($"人工组盘任务数已达{config1.SContent.ToShort()},暂停下发任务");
+                                                }
+                                            }
                                             AgvApi.满托入库(agv.Position, agv.ID.ToString(), agv.Station);
                                             var tasknew = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.ID == agv.TaskId).First();
                                             if (tasknew != null)

YWGC/FJK/WCS.WorkEngineering/Systems/一楼叠盘机入库.cs

@@ -102,7 +102,7 @@ namespace WCS.WorkEngineering.Systems
                         if (res.ResCode == WebApi.Models.WMS.Response.ResponseStatusCodeEnum.Sucess) return;
                     }
                     //找到对应的任务
-                    var taskInfo = db.Queryable<WCS_TaskInfo>().RowLock().First(v => v.BarCode.Contains(barcode) && v.AddrFrom == obj.Entity.Code && v.Type == TaskType.EnterDepot);
+                    var taskInfo = db.Queryable<WCS_TaskInfo>().RowLock().First(v => v.BarCode.Contains(barcode) && v.AddrFrom == obj.Entity.Code && v.Type == TaskType.EnterDepot && v.Status < Entity.TaskStatus.Finish);
                     if (taskInfo.Status == Entity.TaskStatus.WaitingToExecute)
                     {
                         var tunnel = obj.Entity.Targets.FirstOrDefault(v => v.HasFlag(DeviceFlags.巷道));

YWGC/FJK/WCS.WorkEngineering/Systems/重绕区/组盘缓存生成AGV任务.cs

@@ -81,7 +81,7 @@ namespace WCS.WorkEngineering.Systems.重绕区
                 }
                 //分配缓存货位 暂时先根据光电判断
                 List<string> cacheWells = new List<string> { "9201", "9202", "9203", "9204", "9205", "9206", "9207", "9208", "9209","9210","9211","9212",
-                                                                "9213","9214"/*,"9215","9216","9217","9218","9219","9220","9221","9222","9223","9224"*/};
+                                                                "9213","9214","9215",/*"9216","9217","9218","9219","9220","9221","9222","9223","9224"*/};
                 var devs = Device.All.Where(x => cacheWells.Contains(x.Code)).Select(x =>
                                                     new Device<IStation520, IStation521, IStation523>(x, World));
                 if (!devs.Any()) return;

YWGC/FJK/WCS.WorkEngineering/WorkStart.cs

@@ -1911,7 +1911,7 @@ namespace WCS.WorkEngineering
                      { DeviceFlags.Robot, new List<string>(){ "Robot1", "Robot2" } },
                      {DeviceFlags.二次码垛RGV取货口, new List<string>(){ "1606", "1616"}},
                      {DeviceFlags.重绕区叫料工位, new List<string>(){ "9201", "9202","9203", "9204","9205", "9206","9207", "9208","9209",
-                                                                "9210", "9211","9212", "9213","9214",/* "9215","9216", "9217","9218","9219",
+                                                                "9210", "9211","9212", "9213","9214","9215"/*,"9216", "9217","9218","9219",
                                                                  "9220","9221","9222","9223","9224"*/}}
 
                  };