#许可证

zjj

2024-09-05 2790d2558ef656ccddb4dbc94409decc8d227a1e

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

@@ -71,38 +71,46 @@
    /*
     *获取目标库位所在巷道最浅非空库位
     * */
    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L);
    }
//    @Override
//    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
//        if (curRow<nearRow){
//            return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
//        }
//        return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L);
//    }
//
//    @Override
//    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
//        if (curRow<nearRow){
//            return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
//        }
//        return this.baseMapper.selectLocByLocStsPakInF2(locNos,type);
//    }

    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locNos,type);
        return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    }

    /*
     * 获取目标库位所在巷道最深空库位
     * */
//    @Override
//    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
//        if (curRow<nearRow){
//            return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
//        }
//        return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
//    }
    @Override
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        }
        return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
    }
    @Override
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locNos,type);
        }
        return this.baseMapper.selectLocByLocStsPakInO2(locNos,type);
        return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    }

    @Override