兼容四期

zhangc

2025-02-11 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d

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

@@ -253,12 +253,12 @@
    }

    private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示容器离场按钮
        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示货架离场按钮
        if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setContainerMoveOutFlag(true);
        }

        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示容器离场按钮
        //当工作档类型为101.出库 并且 工作位状态为F.在库时，显示货架离场按钮
        if(agvWrkMast.getIoType() == 110 && "D".equals(agvBasDevpDto.getLocSts())){
            agvBasDevpDto.setContainerMoveOutFlag(true);
        }
@@ -300,8 +300,18 @@
    }

    @Override
    public List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor) {
        return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType,floor);
    }

    @Override
    public List<String> selectCacheShelvesStationCodeByLocType(short locType) {
        return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType);
        return this.baseMapper.selectCacheShelvesStationCodeByLocTypeV2(locType);
    }

    @Override
    public List<String> selectCacheShelvesStationCodeByLocType2(short locType, int floor) {
        return this.baseMapper.selectCacheShelvesStationCodeByLocType2(locType,floor);
    }

    public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){