#

lsh

2024-06-17 f6a6cb473735249214e18e0cdb82a7d2914557e0

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

@@ -20,7 +20,12 @@

    @Override
    public LocMast queryFreeLocMast(Integer row, Short locType1) {
        return this.baseMapper.queryFreeLocMast(row, locType1);
        return this.baseMapper.queryFreeLocMast(row, locType1,1L);
    }

    @Override
    public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
        return this.baseMapper.queryFreeLocMast(row, locType1,type);
    }

    @Override
@@ -32,7 +37,19 @@
        if (Cools.isEmpty(sourceStock)) {
            return null;
        }
        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), 1L);
    }

    @Override
    public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
        if (Cools.isEmpty(sourceLocNo)) {
            return null;
        }
        LocMast sourceStock = this.selectById(sourceLocNo);
        if (Cools.isEmpty(sourceStock)) {
            return null;
        }
        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), type);
    }

    @Override
@@ -40,7 +57,15 @@
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
    }

    @Override
    public Boolean checkEmptyCount(LocMast locMast,Long type) {
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
    }

    /*
@@ -49,9 +74,17 @@
    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locNos);
            return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locNos);
        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);
    }

    /*
@@ -60,9 +93,16 @@
    @Override
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locNos);
            return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
        }
        return this.baseMapper.selectLocByLocStsPakInO2(locNos);
        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);
    }

    @Override
@@ -71,15 +111,33 @@
    }

    @Override
    public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
        return null;
    }

    @Override
    public List<LocMast> queryShallowLocFMast(Integer crnNo) {
        return this.baseMapper.queryShallowLocFMast(crnNo);
        return this.baseMapper.queryShallowLocFMast(crnNo,1L);
    }

    @Override
    public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
        return this.baseMapper.queryShallowLocFMast(crnNo,type);
    }

    @Override
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
        if (crnNo==1){
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev);
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
        }
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev);
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
    }

    @Override
    public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
        if (crnNo==1){
            return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
        }
        return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
    }
}