From d1ec9fed69f32140f1c22eb1c3b03acc2a0e24d1 Mon Sep 17 00:00:00 2001 From: rentaiming <806181662@qq.com> Date: 星期日, 07 七月 2024 17:53:41 +0800 Subject: [PATCH] 写入库管理 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java index a499e14..69efe6b 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java @@ -5,12 +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.ManagementimgVolumeProductionRkQuery; -import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery; -import com.ruoyi.management.domain.dto.SlVolumeProductionRkDTO; -import com.ruoyi.management.domain.dto.SlVolumeProductionRkListDTO; +import com.ruoyi.management.domain.dto.*; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; +import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO; import com.ruoyi.management.mapper.*; import com.ruoyi.management.service.SlStoreManagementService; import com.ruoyi.management.service.SlVolumeProductionRkService; @@ -21,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -42,6 +41,9 @@ @Resource private SlGoodsShelfMapper slGoodsShelfMapper; + + @Resource + private SlStoreManagementMapper slStoreManagementMapper; @Resource private SysUserClient sysUserClient; @@ -75,7 +77,7 @@ public PageDTO<ManagementimgVolumeProductionRkVO> getSlGoodsMaterialsSlVolumeProductionRkList(SlGoodsMaterialsSlVolumeProductionRkQuery SlGoodsMaterialsSlVolumeProductionRkDTO) { Page<SlVolumeProductionRk> page = new Page<>(SlGoodsMaterialsSlVolumeProductionRkDTO.getPageCurr(), SlGoodsMaterialsSlVolumeProductionRkDTO.getPageSize()); LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery(); - wrapper1.like(SlVolumeProductionRk::getMaterialsId,SlGoodsMaterialsSlVolumeProductionRkDTO.getSlGoodsMaterialsid()); + wrapper1.eq(SlVolumeProductionRk::getMaterialsId,SlGoodsMaterialsSlVolumeProductionRkDTO.getSlGoodsMaterialsid()); wrapper1.eq( SlVolumeProductionRk::getDelFlag,0); wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime); Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1); @@ -105,6 +107,7 @@ slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId()); slVolumeProductionRk.setMaterialsId(m); slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId()); + slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime()); this.save(slVolumeProductionRk); } @@ -130,4 +133,40 @@ } this.updateById(byId); } + + @Override + public PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) { + Page<SlVolumeProductionRk> page = new Page<>(volumeProductionRkgCodeQuery.getPageCurr(), volumeProductionRkgCodeQuery.getPageSize()); + LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery(); + wrapper1.like(SlVolumeProductionRk::getVolumeProductionRkglId,volumeProductionRkgCodeQuery.getVolumeProductionRkglId()); + wrapper1.eq( SlVolumeProductionRk::getDelFlag,0); + wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime); + Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1); + PageDTO<getVolumeProductionRkgCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionRkgCodeVO.class); + List<getVolumeProductionRkgCodeVO> list2 = SlGoodsShelfDTO.getList(); + for(getVolumeProductionRkgCodeVO list:list2) {{ + SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId()); + list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); + list.setIsConsume(slGoodsMaterials.getIsConsume()); + } + } + return SlGoodsShelfDTO; + } + + @Override + public ManagementimgVolumeProductionRkVO codeInfo(Integer id) { + SlVolumeProductionRk byId = this.getById(id); + ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO(); + SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId()); + vo.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); + vo.setIsConsume(slGoodsMaterials.getIsConsume()); + SlVolumeProductionRkgl byId1 = slVolumeProductionRkglMapper.selectById(byId.getVolumeProductionRkglId()); + SysUser data = sysUserClient.getSysUser(byId1.getSupplierId()).getData(); + vo.setSupplierName(data.getNickName()); + SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId()); + vo.setStoreManagementName(slStoreManagement.getStoreManagementName()); + vo.setRkNum(byId.getRkNum()); + vo.setRkNumber(byId.getRkNumber()); + return vo; + } } -- Gitblit v1.7.1