#

luxiaotao1123

2021-05-18 3cff0f9a0fc7562631fe510dc1b40c1f41a6f799

#

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -406,6 +406,9 @@
        if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
            throw new CoolException("移转库位属于不同堆垛机");
        }
        if (!VersionUtils.locMoveCheckLocType0(sourceLoc, loc)) {
            throw new CoolException("库位规格错误");
        }
        // 获取工作号
        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
        // 保存工作档

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

@@ -156,7 +156,20 @@
     *  库位移转时类型检测
     **/
    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
        // 如果源库位是高库位，目标库位是低库位
        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
            return false;
        }
        return true;
    }

    /**
     *  库位移转时类型检测
     **/
    public static boolean locMoveCheckLocType0(LocMast sourceLoc, LocMast loc){
        // 如果源库位是高库位，目标库位是低库位
        return sourceLoc.getLocType1() != 2 || loc.getLocType1() != 1;
    }


}

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

@@ -210,6 +210,11 @@
            }
        }
        if (Cools.isEmpty(locMast)) {
            // 轻货物找轻库位为空时，可以去找重库位仓
            if (locTypeDto.getLocType1() == 1) {
                locTypeDto.setLocType1((short) 2);
                return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }
            if (times >= rowCount) {
                log.error("没有空库位");
                throw new CoolException("没有空库位");