森林防火 供应商管理

rentaiming

2024-07-22 3fa04e2d1e41455b84b1bba63429a4513f44e74e

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java

@@ -148,17 +148,16 @@
        Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
        PageDTO<getVolumeProductionRkgCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionRkgCodeVO.class);
        List<getVolumeProductionRkgCodeVO> list2 = SlGoodsShelfDTO.getList();
        for(getVolumeProductionRkgCodeVO list:list2) {{
        for(getVolumeProductionRkgCodeVO list:list2) {
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
        }
        }
        return SlGoodsShelfDTO;
    }

    @Override
    public ManagementimgVolumeProductionRkVO codeInfo(Integer id) {
    public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
        SlVolumeProductionRk byId = this.getById(id);
        ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
        SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
@@ -178,7 +177,9 @@
    public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {

        LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
        if (meProductionRkQuery.getGoodsMaterialsName()!=null&&meProductionRkQuery.getGoodsMaterialsName()!=""){
            wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
        }
        if (meProductionRkQuery.getIsConsume()!=0){
            wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
        }
@@ -192,9 +193,15 @@

        Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
        LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
    if(meProductionRkQuery.getManagementId()!=null&&meProductionRkQuery.getManagementId()!=0){
        wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
    }
        if (goodsSkuIdList.size()>0){
            wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
        }if(meProductionRkQuery.getStoreManagementNumber()!=null&&meProductionRkQuery.getStoreManagementNumber()!=0){
            wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
        }if(meProductionRkQuery.getShelfId()!=null&&meProductionRkQuery.getShelfId()!=0){
            wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
        }
        wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);