#

lty

9 小时以前 e8e108b1f18fb0b73f9752ac6cedaf47f1ce26f1

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

@@ -10,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

@Service("locMastService")
@@ -71,38 +72,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
@@ -140,4 +149,14 @@
        }
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
    }

    @Override
    public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
        return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
    }

    @Override
    public List<Integer> getLevList() {
        return this.baseMapper.getLevList();
    }
}