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

无关风月

2024-07-30 87e07ac8b8f1868eb4302fac73dfc93c5417f977

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/SlGoodsShelfController.java

@@ -40,6 +40,12 @@
        return R.ok(slGoodsShelfService.getGoodsShelfList(slGoodsShelfQuery));
    }

    @PostMapping("/getBGoodsShelfList")
    @ApiOperation(value = "分页不获货架表管理")
    public R<List<SlGoodsShelf>> getBGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery) {
        return R.ok(slGoodsShelfService.getBGoodsShelfList(slGoodsShelfQuery));
    }

    @PostMapping("/addSlGoodsShelf")
    @ApiOperation(value = "添加/修改货架管理")
    public R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO) {

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

@@ -25,6 +25,8 @@
public interface SlGoodsShelfService extends IService<SlGoodsShelf> {
    PageDTO<SlGoodsShelfVO> getGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery);

    List<SlGoodsShelf> getBGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery);

   void addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO);

    SlGoodsShelfVO getSlGoodsShelfOne( Long id);

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

@@ -103,6 +103,44 @@
    }

    @Override
    public List<SlGoodsShelf> getBGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
        Long userid = SecurityUtils.getUserId();
        SysUser data = sysUserClient.getSysUser(userid).getData();

        LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
        }
        wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
        wrapper.eq(SlStoreManagement::getDelFlag,0);
        List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
        Set<Long> slStoreManagementIdList = null;
        slStoreManagementIdList = page1.stream().map(SlStoreManagement::getId)
                .collect(Collectors.toSet());


        LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
        wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
        if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
            if (slStoreManagementIdList.size() > 0) {
                wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
            } else {
                slStoreManagementIdList=new HashSet<>();
                slStoreManagementIdList.add(0L);
                wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
            }
        }
        wrapper1.eq( SlGoodsShelf::getDelFlag,0);
        wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
        List<SlGoodsShelf> page2 = this.list(wrapper1);

        return page2;
    }

    @Override
    public void addSlGoodsShelf(SlGoodsShelfDTO slGoodsShelfDTO) {
        if (slGoodsShelfDTO.getId()==null){
            SlGoodsShelf slGoodsShelf=new SlGoodsShelf();