森林防火 供应商管理

rentaiming

2024-07-18 2f607c4b72c1ce7ddcfbdcaf97038012ca054d7e

森林防火 供应商管理

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

@@ -40,10 +40,18 @@
        return R.ok(slVolumeProductionCkService.getManagementimgSlVolumeProductionCkList(slGoodsMaterialsSlVolumeProductionRkQuery));
    }


    @PostMapping("/addSlVolumeProductionCk")
    @ApiOperation(value = "添加/修改出库")
    public R addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
        slVolumeProductionCkService.addSlVolumeProductionCk(slVolumeProductionCkDTO);
    @ApiOperation(value = "添加出库")
    public R addSlVolumeProductionCk(@RequestBody AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO) {
        slVolumeProductionCkService.addSlVolumeProductionCk(addSlVolumeProductionCkDTO);
        return R.ok();
    }

    @PostMapping("/updSlVolumeProductionCk")
    @ApiOperation(value = "修改出库")
    public R updSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
        slVolumeProductionCkService.updSlVolumeProductionCk(slVolumeProductionCkDTO);
        return R.ok();
    }


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

@@ -79,9 +79,10 @@


    @PostMapping("/getroductionRkList")
    @ApiOperation(value = "分页获取通过仓库管理ID当前批次入库的物资")
    @ApiOperation(value = "分页获取通过仓库管理ID和仓库层数和货架获取前批次入库的物资")
    public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList(@RequestBody umeProductionRkQuery meProductionRkQuery) {
        return R.ok(slVolumeProductionRkService.getroductionRkList(meProductionRkQuery));
    }


}

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

@@ -3,17 +3,16 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.dto.VolumeProductionRkgCodeQuery;
import com.ruoyi.management.domain.dto.VolumeProductionZygCodeQuery;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO;
import com.ruoyi.management.service.SlVolumeProductionZyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -38,4 +37,33 @@
    public R<PageDTO<getVolumeProductionzyCodeVO>> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) {
        return R.ok(slVolumeProductionZyService.getVolumeProductionzyCode(volumeProductionZygCodeQuery));
    }

    @PostMapping("/addSlVolumeProductionZy")
    @ApiOperation(value = "添加转移")
    public R addSlVolumeProductionZy(@RequestBody AddaddSlVolumeProductionZyDTO addaddSlVolumeProductionZyDTO) {
        slVolumeProductionZyService.addSlVolumeProductionZy(addaddSlVolumeProductionZyDTO);
        return R.ok();
    }

    @PostMapping("/updSlVolumeProductionZy")
    @ApiOperation(value = "修改转移")
    public R updSlVolumeProductionZy(@RequestBody UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO) {
        slVolumeProductionZyService.updSlVolumeProductionZy(updaddSlVolumeProductionZyDTO);
        return R.ok();
    }

    @PostMapping("/getSlVolumeProductionZyList")
    @ApiOperation(value = "分页获取通过转移管理ID当前出库的物资")
    public R<PageDTO<ManagementimgVolumeProductionZyVO>> getSlVolumeProductionZyList(@RequestBody ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {
        return R.ok(slVolumeProductionZyService.getSlVolumeProductionZyList(managementimgVolumeProductionZyQuery));
    }

    @ApiOperation("删除转移批次")
    @DeleteMapping("/{id}")
    public R<?> delStoreManagement(
            @ApiParam(name = "id", value = "转移批次id", required = true) @PathVariable("id") Integer id) {
        slVolumeProductionZyService.removeById(id);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java

@@ -90,7 +90,7 @@

    @ApiModelProperty("是否匹配 1未匹配，已匹配")
    @TableField("type")
    private String type;
    private Integer type;

    @ApiModelProperty("出库时间")
    @TableField("ck_time")

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java

@@ -37,7 +37,7 @@

    @ApiModelProperty("入库")
    @TableField("rk_id")
    private Integer rkId;
    private Long rkId;

    @ApiModelProperty("转移数量")
    @TableField("zy_num")

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

New file
@@ -0,0 +1,17 @@
package com.ruoyi.management.domain.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("添加出库库批次数据传输对象")
public class AddSlVolumeProductionCkDTO {
    @ApiModelProperty("出库管理id")
    private Long ckgl_id;

    @ApiModelProperty("入库批次")
    private List<Long> rkId;
}

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

New file
@@ -0,0 +1,16 @@
package com.ruoyi.management.domain.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;
@Data
@ApiModel("添加转移库批次数据传输对象")
public class AddaddSlVolumeProductionZyDTO {
    @ApiModelProperty("转移管理id")
    private Long zygl_id;

    @ApiModelProperty("入库批次")
    private List<Long> rkId;
}

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

New file
@@ -0,0 +1,19 @@
package com.ruoyi.management.domain.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("通过转移管理拿入库物资的数据取对象")
public class ManagementimgVolumeProductionZyQuery extends BasePage {
    @ApiModelProperty("入管理主表id")
    private Long VolumeProductionzyglId;

    @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
    private Integer storeManagementNumber;

    @ApiModelProperty("货架id")
    private Long shelfId;
}

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

New file
@@ -0,0 +1,42 @@
package com.ruoyi.management.domain.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "通过出库管理拿出库物资的数据对象", description = "通过出库管理拿出库物资的数据对象")
public class ManagementimgVolumeProductionZyVO {
    private Long id;

    @ApiModelProperty("物资名称")
    private String goodsMaterialsName;

    @ApiModelProperty("货架名称")
    private String goodsShelfName;

    @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
    private Integer storeManagementNumber;

    @ApiModelProperty("在库存的")
    private Long repertoryZhai;


    @ApiModelProperty("转移数量")
    private Integer zyNum;

    @ApiModelProperty("入库批次")
    private Long rkId;

    @ApiModelProperty("入库编号")
    private String rkNumber;

    @ApiModelProperty("转移入库批次")
    private Long scrkId;

    @ApiModelProperty("转移入库编号")
    private String zyrkNumber;

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;
}

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

@@ -26,4 +26,6 @@
    @ApiModelProperty("归还数量")
    @TableField("guih_num")
    private Integer guihNum;


}

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

@@ -38,4 +38,7 @@

    @ApiModelProperty("二维码数量")
    private Integer erwmNum;

    @ApiModelProperty("入库管理id")
    private Long rkgl_id;
}

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

New file
@@ -0,0 +1,17 @@
package com.ruoyi.management.domain.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("修改转移库批次数据传输对象")
public class UpdaddSlVolumeProductionZyDTO {
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;
    @ApiModelProperty("转移数量")
    private Integer zyNum;
}

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

@@ -16,4 +16,10 @@

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;

    @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
    private Integer storeManagementNumber;

    @ApiModelProperty("货架id")
    private Long shelfId;
}

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

@@ -3,6 +3,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.AddSlVolumeProductionCkDTO;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionCkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
@@ -24,9 +25,11 @@

    PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);

    void addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO);
    void updSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO);
    void addSlVolumeProductionCk(AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO);


    PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);

    List<ManagementimgVolumeProductionCkVO> SlVolumeProductionCkList(@RequestBody ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
    List<ManagementimgVolumeProductionCkVO> SlVolumeProductionCkList( ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
}

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

@@ -3,9 +3,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.dto.VolumeProductionZygCodeQuery;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO;
import org.springframework.web.bind.annotation.RequestBody;

@@ -20,4 +18,9 @@
public interface SlVolumeProductionZyService extends IService<SlVolumeProductionZy> {
    PageDTO<getVolumeProductionzyCodeVO> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery);

    void addSlVolumeProductionZy(AddaddSlVolumeProductionZyDTO addaddSlVolumeProductionZyDTO);

    void  updSlVolumeProductionZy(UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO);

    PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList( ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery);
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.AddSlVolumeProductionCkDTO;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionCkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
@@ -22,6 +23,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -63,16 +65,26 @@
    }

    @Override
    public void addSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
        if (slVolumeProductionCkDTO.getId()==null){
            SlVolumeProductionCk slVolumeProductionCk=new SlVolumeProductionCk();
            slVolumeProductionCk.setCkglId(slVolumeProductionCkDTO.getId());
            slVolumeProductionCk.setRkId(slVolumeProductionCkDTO.getRkId());
        }else{
    public void updSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
            SlVolumeProductionCk byId = this.getById(slVolumeProductionCkDTO.getId());
            byId.setCkNum(slVolumeProductionCkDTO.getCkNum());
            byId.setGuihNum(slVolumeProductionCkDTO.getGuihNum());
            this.updateById(byId);

    }

    @Override
    public void addSlVolumeProductionCk(AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO) {
        List<Long> rkId = addSlVolumeProductionCkDTO.getRkId();
        for (Long m:rkId){
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m);
            SlVolumeProductionCk slVolumeProductionCk=new SlVolumeProductionCk();
            slVolumeProductionCk.setRkId(m);
            slVolumeProductionCk.setCkglId(addSlVolumeProductionCkDTO.getCkgl_id());
            slVolumeProductionCk.setState(1);
            slVolumeProductionCk.setType(1);
            slVolumeProductionCk.setMaterialsId(slVolumeProductionRk.getMaterialsId());
            this.save(slVolumeProductionCk);
        }
    }


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

@@ -194,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);

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

@@ -5,15 +5,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.dto.VolumeProductionZygCodeQuery;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.mapper.SlVolumeProductionZyMapper;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlVolumeProductionZyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.SysUser;
@@ -41,12 +36,35 @@
    private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
    @Resource
    private SlGoodsMaterialsMapper slGoodsMaterialsMapper;

    @Resource
    private SlVolumeProductionZyglMapper slVolumeProductionZyglMapper;
    @Resource
    private SlGoodsShelfMapper slGoodsShelfMapper;
    @Override
    public PageDTO<getVolumeProductionzyCodeVO> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) {

        SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(volumeProductionZygCodeQuery.getVolumeProductionzylId());

        LambdaQueryWrapper<SlVolumeProductionRk> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(SlVolumeProductionRk::getManagementId,slVolumeProductionZygl.getBmanagementId());
        wrapper2.eq(SlVolumeProductionRk::getStoreManagementNumber,volumeProductionZygCodeQuery.getStoreManagementNumber());
        wrapper2.eq(SlVolumeProductionRk::getShelfId,volumeProductionZygCodeQuery.getShelfId());
        wrapper2.eq( SlVolumeProductionRk::getDelFlag,0);
        wrapper2.orderByDesc(SlVolumeProductionRk::getCreateTime);
        List<SlVolumeProductionRk> page1 = slVolumeProductionRkMapper.selectList(wrapper2);

        Set<Long> goodsSkuIdList = null;
        goodsSkuIdList = page1.stream().map(SlVolumeProductionRk::getId)
                .collect(Collectors.toSet());


        Page<SlVolumeProductionZy> page = new Page<>(volumeProductionZygCodeQuery.getPageCurr(), volumeProductionZygCodeQuery.getPageSize());
        LambdaQueryWrapper< SlVolumeProductionZy> wrapper1= Wrappers.lambdaQuery();
        wrapper1.like(SlVolumeProductionZy::getZyglId,volumeProductionZygCodeQuery.getVolumeProductionzylId());
        wrapper1.eq(SlVolumeProductionZy::getZyglId,volumeProductionZygCodeQuery.getVolumeProductionzylId());
        if (goodsSkuIdList.size()>0&&goodsSkuIdList!=null){
            wrapper1.in(SlVolumeProductionZy::getScrkId,goodsSkuIdList);
        }
        wrapper1.eq( SlVolumeProductionZy::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime);
        Page<SlVolumeProductionZy> page2 = this.page(page, wrapper1);
@@ -61,4 +79,69 @@
        return SlGoodsShelfDTO;

    }

    @Override
    public void addSlVolumeProductionZy(AddaddSlVolumeProductionZyDTO addaddSlVolumeProductionZyDTO) {
        List<Long> rkId = addaddSlVolumeProductionZyDTO.getRkId();
        for (Long m:rkId){
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m);
            SlVolumeProductionZy slVolumeProductionZy=new SlVolumeProductionZy();
            slVolumeProductionZy.setRkId(m);
            slVolumeProductionZy.setZyglId(addaddSlVolumeProductionZyDTO.getZygl_id());
            slVolumeProductionZy.setState(1);
            slVolumeProductionZy.setMaterialsId(slVolumeProductionRk.getMaterialsId());
            slVolumeProductionZy.setZyglId(addaddSlVolumeProductionZyDTO.getZygl_id());
            this.save(slVolumeProductionZy);
        }
    }

    @Override
    public void updSlVolumeProductionZy(UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO) {
        SlVolumeProductionZy byId = this.getById(updaddSlVolumeProductionZyDTO.getId());
        byId.setZyNum(updaddSlVolumeProductionZyDTO.getZyNum());
        this.updateById(byId);
    }

    @Override
    public PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList(ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {

        SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(managementimgVolumeProductionZyQuery.getVolumeProductionzyglId());

        LambdaQueryWrapper<SlVolumeProductionRk> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(SlVolumeProductionRk::getManagementId,slVolumeProductionZygl.getBmanagementId());
        wrapper2.eq(SlVolumeProductionRk::getStoreManagementNumber,managementimgVolumeProductionZyQuery.getStoreManagementNumber());
        wrapper2.eq(SlVolumeProductionRk::getShelfId,managementimgVolumeProductionZyQuery.getShelfId());
        wrapper2.eq( SlVolumeProductionRk::getDelFlag,0);
        wrapper2.orderByDesc(SlVolumeProductionRk::getCreateTime);
        List<SlVolumeProductionRk> page1 = slVolumeProductionRkMapper.selectList(wrapper2);

        Set<Long> goodsSkuIdList = null;
        goodsSkuIdList = page1.stream().map(SlVolumeProductionRk::getId)
                .collect(Collectors.toSet());


        Page<SlVolumeProductionZy> page = new Page<>(managementimgVolumeProductionZyQuery.getPageCurr(), managementimgVolumeProductionZyQuery.getPageSize());
        LambdaQueryWrapper< SlVolumeProductionZy> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SlVolumeProductionZy::getZyglId,managementimgVolumeProductionZyQuery.getVolumeProductionzyglId());
        if (goodsSkuIdList.size()>0&&goodsSkuIdList!=null){
            wrapper1.in(SlVolumeProductionZy::getScrkId,goodsSkuIdList);
        }
        wrapper1.eq( SlVolumeProductionZy::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime);
        Page<SlVolumeProductionZy> page2 = this.page(page, wrapper1);
        PageDTO<ManagementimgVolumeProductionZyVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionZyVO.class);
        List<ManagementimgVolumeProductionZyVO> list2 = SlGoodsShelfDTO.getList();
        for(ManagementimgVolumeProductionZyVO list:list2) {
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId());
            list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
            list.setRkNumber(slVolumeProductionRk.getRkNumber());
            list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
        }
        return SlGoodsShelfDTO;
    }
}