Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXi...

xiazhengtongxue

3 天以前 0f710285d9f02e3d4cea19557e17945e9ef9532b

 Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs

@@ -159,9 +159,12 @@
                    && x.LocationType == locationType)
                .CountAsync();

            // 空闲货位不足最低保留数量时返回null，避免将巷道分配耗尽
            const int minFreeLocationThreshold = 5;
            if (freeCount < minFreeLocationThreshold) return null;
            if(roadwayNo != "CWSC1")
            {
                // 空闲货位不足最低保留数量时返回null，避免将巷道分配耗尽
                const int minFreeLocationThreshold = 1;
                if (freeCount < minFreeLocationThreshold) return null;
            }

            // 数据库端排序取第一条（只传输单行数据）
            return await BaseDal.Db.Queryable<Dt_LocationInfo>()