森林防火 供应商管理

rentaiming

2024-07-19 d204e01db828bbe4dd9ad5e19d6ff13f99334478

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

@@ -148,11 +148,10 @@
        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;
    }
@@ -195,6 +194,10 @@
        wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
        if (goodsSkuIdList.size()>0){
            wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
        }if(meProductionRkQuery.getStoreManagementNumber()!=null){
            wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
        }if(meProductionRkQuery.getShelfId()!=null){
            wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
        }
        wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);