Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

21 小时以前 8570b32ed879dbe625b58d31c6ed04288cd9d476

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -256,6 +256,12 @@
        LocMast locMast = service.selectById(this.locNo);
        if (!Cools.isEmpty(locMast)){
            return String.valueOf(locMast.getLocNo());
        }else {
            LocCacheService service2 = SpringUtils.getBean(LocCacheService.class);
            LocCache locCache = service2.selectOne(new EntityWrapper<LocCache>().eq("loc_no", this.locNo));
            if (!Cools.isEmpty(locCache)){
                return String.valueOf(locCache.getLocNo());
            }
        }
        return null;
    }