#

zzgtfwq

昨天 8ea4c0fa09a08ec40e5f453bcde0fc7397b15b0d

 src/main/java/com/zy/common/service/CommonService.java

@@ -152,7 +152,8 @@
            }

        } catch (Exception e) {
            log.error("站点={} 未查询到对应的规则", sourceStaNo);
            log.error("站点={} 未查询到对应的规则"+e.getMessage(), sourceStaNo);
            throw new CoolException(sourceStaNo+"站点, 未查询到对应的规则"+e.getMessage());
        }
        return null;
    }
@@ -375,7 +376,7 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .orderBy("lev1", true).orderBy("bay1", false));
                    .orderBy("lev1", true).orderBy("bay1", true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
@@ -440,7 +441,7 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .orderBy("lev1", true).orderBy("bay1", false));
                    .orderBy("lev1", true).orderBy("bay1", true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;