From d204e01db828bbe4dd9ad5e19d6ff13f99334478 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 16:47:28 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 16c9e66..9ca0a0e 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
@@ -47,6 +47,10 @@
@Resource
private SysUserClient sysUserClient;
+
+
+
+
@Override
public PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
@@ -144,11 +148,10 @@
Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
PageDTO<getVolumeProductionRkgCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionRkgCodeVO.class);
List<getVolumeProductionRkgCodeVO> list2 = SlGoodsShelfDTO.getList();
- for(getVolumeProductionRkgCodeVO list:list2) {{
+ for(getVolumeProductionRkgCodeVO list:list2) {
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
list.setIsConsume(slGoodsMaterials.getIsConsume());
- }
}
return SlGoodsShelfDTO;
}
@@ -170,4 +173,50 @@
return vo;
}
+ @Override
+ public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
+
+ LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ if (meProductionRkQuery.getIsConsume()!=0){
+ wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
+ }
+ wrapper.eq( SlGoodsMaterials::getDelFlag,0);
+ List<SlGoodsMaterials> page1 = slGoodsMaterialsMapper.selectList(wrapper);
+
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = page1.stream().map(SlGoodsMaterials::getId)
+ .collect(Collectors.toSet());
+
+
+ Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
+ LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ 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);
+ Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
+ PageDTO<ManagementimgVolumeProductionRkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionRkVO.class);
+ List<ManagementimgVolumeProductionRkVO> list2 = SlGoodsShelfDTO.getList();
+ for(ManagementimgVolumeProductionRkVO list:list2) {
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+
+ SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ list.setSupplierName(data.getNickName());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ }
+ return SlGoodsShelfDTO;
+ }
+
}
--
Gitblit v1.7.1