优化AGV站点分配逻辑

dengjunjie

2025-06-06 c1b448e302ae76d129eb136b698308754bf783c5

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/CachePointService.cs

@@ -27,18 +27,18 @@

        public Dt_CachePoint? AssignCachePoint(int areaId)
        {
            List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
            List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.Free, LocationStatusEnum.InStock);
            if (cachePointGroups != null && cachePointGroups.Count > 0)
            {
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
                int id = pointGroupDTO?.IdB ?? 0;
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.PointStatusA == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt()));
                int id = pointGroupDTO?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }
            cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.Free, LocationStatusEnum.Free);
            if (cachePointGroups != null && cachePointGroups.Count > 0)
            {
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
                int id = pointGroupDTO?.IdA ?? 0;
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.PointStatusB == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt()));
                int id = pointGroupDTO?.IdB ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }

@@ -50,15 +50,24 @@
            List<CachePointGroupDTO> cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.Free);
            if (cachePointGroups != null && cachePointGroups.Count > 0)
            {
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.PointStatusA == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatusA == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()));
                int id = pointGroupDTO?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }

            cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.Free, LocationStatusEnum.InStock);
            if (cachePointGroups != null && cachePointGroups.Count > 0)
            {
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.PointStatusB == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatusB == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()));
                int id = pointGroupDTO?.IdB ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }

            cachePointGroups = Repository.GetCachePointGroups(areaId, LocationStatusEnum.InStock, LocationStatusEnum.InStock);
            if (cachePointGroups != null && cachePointGroups.Count > 0)
            {
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
                int id = pointGroupDTO?.IdB ?? 0;
                CachePointGroupDTO? pointGroupDTO = cachePointGroups.FirstOrDefault(x => x.PointStatusA == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatusA == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()));
                int id = pointGroupDTO?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }