优化WMS接口逻辑

dengjunjie

2026-03-11 b2cc7bb7740e42e57cf50af02a8ca4b535cad484

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs

@@ -20,10 +20,10 @@
        }
        private Dictionary<string, OrderByType> _emptyAssignOrderBy = new Dictionary<string, OrderByType>()
        {
            { nameof(Dt_RGVLocationInfo.Row), OrderByType.Asc },
            { nameof(Dt_RGVLocationInfo.Depth), OrderByType.Desc },
            { nameof(Dt_RGVLocationInfo.Layer), OrderByType.Asc },
            //{ nameof(Dt_RGVLocationInfo.Column), OrderByType.Asc },
            { nameof(Dt_RGVLocationInfo.Row), OrderByType.Asc },
        };
        private Dictionary<string, OrderByType> _DepthAscOrderBy = new Dictionary<string, OrderByType>()
        {
@@ -40,26 +40,76 @@
        /// </summary>
        /// <param name="AreaCode"></param>
        /// <returns></returns>
        public Dt_RGVLocationInfo GetInFreeLocationInfo(string AreaCode)
        public Dt_RGVLocationInfo? GetInFreeLocationInfo(string AreaCode)
        {
            Dt_RGVLocationInfo? rGVLocationInfo = BaseDal.QueryFirst(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);
            Dt_RGVLocationInfo? rGVLocationInfo = null;
            Dt_RGVLocationInfo? FreerGVLocationInfo = null;
            List<Dt_RGVLocationInfo> rGVLocationInfos = BaseDal.QueryData(x => x.WarehouseId.ToString() == AreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _emptyAssignOrderBy);//查找所有空货位
            if (rGVLocationInfos == null || rGVLocationInfos.Count < 1) return rGVLocationInfo;
            #region åˆ¤æ–­å··é“是否有货
            if (rGVLocationInfo != null)
            List<string> LocationCodes = new List<string>();
            foreach (var items in rGVLocationInfos.GroupBy(x => x.RoadwayNo))//根据巷道号分组
            {
                List<string> NoRoadwayNos = new List<string>();
                while (true)
                foreach (var item in items)
                {
                    Dt_RGVLocationInfo dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth < rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
                    if (dt_RGVLocationInfo == null) return rGVLocationInfo;
                    List<Dt_RGVLocationInfo> dt_RGVLocationInfos = BaseDal.QueryData(x => x.RoadwayNo == items.Key);//查找当前巷道号货位
                    if (item.LocationType == 1)
                    {
                        rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault();//判断浅深度货位是否有货
                        if (rGVLocationInfo != null) break;
                        return item;
                    }
                    else
                    {
                        rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth < item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).OrderByDescending(x => x.Depth).FirstOrDefault();//判断浅深度货位是否有货
                        if (rGVLocationInfo != null)
                        {
                            rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).OrderBy(x => x.Depth).FirstOrDefault();
                            if (rGVLocationInfo != null)
                            {
                                if (dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).Any()) rGVLocationInfo = null;
                                else return rGVLocationInfo;
                            }
                            //var Depth = 0;
                            //while (item.Depth - rGVLocationInfo.Depth != 0)
                            //{
                            //    if (rGVLocationInfo.Depth < item.Depth) Depth = rGVLocationInfo.Depth - 1;
                            //    else Depth = rGVLocationInfo.Depth + 1;
                            //    rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth == Depth).FirstOrDefault();
                            //    if (rGVLocationInfo != null && rGVLocationInfo.LocationStatus == (int)LocationStatusEnum.Free) return rGVLocationInfo;
                            //}
                        }//判断浅深度货位是否有货
                        else return item;
                    }

                    rGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == dt_RGVLocationInfo.RoadwayNo && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Depth > dt_RGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.Free.ObjToInt(), _DepthAscOrderBy);
                    dt_RGVLocationInfo = BaseDal.QueryFirst(x => x.RoadwayNo == rGVLocationInfo.RoadwayNo && x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt(), _emptyAssignOrderBy);
                    if (dt_RGVLocationInfo == null) return rGVLocationInfo;

                    //if (rGVLocationInfo != null)//浅深度货位有货，找深深度货位是否有货
                    //{
                    //    if (item.LocationType == 1) break;//巷道类型为单向，直接跳过
                    //    foreach (var locationInfo in rGVLocationInfos.Where(x => x.RoadwayNo == items.Key).OrderByDescending(x => x.Depth))
                    //    {
                    //        if (!dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.Depth < locationInfo.Depth).Any()) return locationInfo;
                    //    }
                    //    //rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).OrderBy(x => x.Depth).FirstOrDefault();//找浅深度空货位
                    //    //if (rGVLocationInfo != null)
                    //    //{
                    //    //    if (dt_RGVLocationInfos.Where(x => x.Depth > rGVLocationInfo.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault() == null)//判断深深度货位是否有货
                    //    //        return rGVLocationInfo;
                    //    //}
                    //}
                    //if (rGVLocationInfo == null)
                    //{
                    //    rGVLocationInfo = dt_RGVLocationInfos.Where(x => x.Depth > item.Depth && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt()).FirstOrDefault();//判断浅深度货位是否有货
                    //    if (item.LocationType == 1) break;//巷道类型为单向，直接跳过
                    //    foreach (var locationInfo in rGVLocationInfos.Where(x => x.RoadwayNo == items.Key).OrderByDescending(x => x.Depth))
                    //    {
                    //        if (!dt_RGVLocationInfos.Where(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.Depth < locationInfo.Depth).Any()) return locationInfo;
                    //    }
                    //}
                    //else return item;
                }
            }
            #endregion
            return rGVLocationInfo;
            return FreerGVLocationInfo;
        }
    }
}