From 2f607c4b72c1ce7ddcfbdcaf97038012ca054d7e Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期四, 18 七月 2024 17:59:45 +0800 Subject: [PATCH] 森林防火 供应商管理 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java index 631013e..2678a36 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java +++ b/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; + } } -- Gitblit v1.7.1