森林防火 供应商管理

rentaiming

2024-07-22 3fa04e2d1e41455b84b1bba63429a4513f44e74e

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

@@ -53,6 +53,7 @@
            slGoodsMaterials.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
            slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
            slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
            this.save(slGoodsMaterials);
        }else{
            SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
            if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){
@@ -60,6 +61,16 @@
            }
            if (slGoodsMaterialsDTO.getRepertory()!=null){
                byId.setRepertory(slGoodsMaterialsDTO.getRepertory());
                LambdaQueryWrapper<ManagementGoodsMaterials> wrapper3= Wrappers.lambdaQuery();
                wrapper3.eq(ManagementGoodsMaterials::getGoodsMaterialsId,byId.getId());
                wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
                wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime);
                List<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.list(wrapper3);
                for (ManagementGoodsMaterials pg:page1){
                    pg.setRepertory(slGoodsMaterialsDTO.getRepertory());
                    managementGoodsMaterialsService.updateById(pg);
                }

            }
            if (slGoodsMaterialsDTO.getIsConsume()!=null){
                byId.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
@@ -72,7 +83,9 @@
    public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
        Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
        LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&slGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
            wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        }
        if (slGoodsMaterialsQuery.getIsConsume()!=0){
            wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
        }