Merge remote-tracking branch 'origin/ytflWms' into ytflWms

Junjie

8 天以前 ca2a6d455604056ce628f296911f6abac85a7598

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -28,7 +28,11 @@
     **/
    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        return dto.getLocType1().equals(loc.getLocType1());
        boolean flag = dto.getLocType1().equals(loc.getLocType1());
        if (flag) {
            flag = dto.getLocType2().equals(loc.getLocType2());
        }
        return flag;
    }

}