xiazhengtongxue
2026-02-09 e81c782b3e7a632ffb8e32be56fce931a8c89ae6
ÏîÄ¿´úÂë/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs
@@ -112,7 +112,21 @@
                    { nameof(Dt_LocationInfo.Columns),OrderByType.Desc },
                };
                Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//查询空货位信息并排除5分钟内分配的货位,根据层、列、深度、行排序
                //Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//查询空货位信息并排除5分钟内分配的货位,根据层、列、深度、行排序
                // åˆå¹¶æŸ¥è¯¢æ¡ä»¶ï¼Œä¼˜å…ˆ44~48列,若无则查全部
                Dt_LocationInfo locationInfo = BaseDal.QueryFirst(
                    x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
                        && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt()
                        && !lockLocations.Contains(x.LocationCode)
                        && (x.Columns >= 44 && x.Columns <= 48), // ä¼˜å…ˆ44~48列的条件
                    orderBy)
                    ??
                    BaseDal.QueryFirst(
                        x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
                            && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt()
                            && !lockLocations.Contains(x.LocationCode),
                        orderBy);
                if (locationInfo!=null)
                {
                    LocationCache locationCache = new LocationCache()