Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFi...

无关风月

2024-07-30 95727f675f239e0b6e34c32d6ee773b66c9e3689

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java

@@ -43,4 +43,7 @@






}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java

@@ -78,6 +78,12 @@
        return R.ok(slGoodsMaterialsService.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsQuery));
    }

    @PostMapping("/getSmaterialsOne")
    @ApiOperation(value = "感觉物资库存管理查看详情")
    public R<StoreManagementGoodSmaterialsVO> getSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
        return R.ok(slGoodsMaterialsService.getSmaterialsOne(storeManagementGoodSmaterialsQuery));
    }

    @GetMapping("/getGooManagementGoodSmaterials/{id}")
    @ApiOperation(value = "库存管理查看物资詳情")
    public R<StoreManagementGoodSmaterialsVO> getGooManagementGoodSmaterials(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Long id) {

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java

@@ -14,6 +14,9 @@
    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;

    @ApiModelProperty("物资id")
    private Long goodsMaterialsId;


    @ApiModelProperty("仓库id")
    private Long storeManagementId;

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java

@@ -27,4 +27,6 @@

    PageDTO<StoreManagementGoodSmaterialsVO> getStoreManagementGoodSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery);

    StoreManagementGoodSmaterialsVO getSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery);

}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsMaterials;
@@ -21,6 +22,7 @@
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.micrometer.core.instrument.binder.BaseUnits;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -145,4 +147,25 @@

        return storeManagementGoodSmaterialsVOPageDTO;
    }

    @Override
    public StoreManagementGoodSmaterialsVO getSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
        LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();


        wrapper.eq(ManagementGoodsMaterials::getGoodsMaterialsId,storeManagementGoodSmaterialsQuery.getGoodsMaterialsId());

        wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
        wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
        ManagementGoodsMaterials page1 = managementGoodsMaterialsService.getOne(wrapper);
        StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO = BeanUtils.copyBean(page1, StoreManagementGoodSmaterialsVO.class);
            Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
            SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
        storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
        storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());
        storeManagementGoodSmaterialsVO.setAveragePrice(storeManagementGoodSmaterialsOne);
           return storeManagementGoodSmaterialsVO;
        }


}