From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index 144b8b6..32fd7ff 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionRk;
@@ -13,8 +14,10 @@
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
+import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
+import com.ruoyi.management.service.ManagementGoodsMaterialsService;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlVolumeProductionRkService;
@@ -39,6 +42,9 @@
@Resource
private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
+ @Resource
+ private ManagementGoodsMaterialsService managementGoodsMaterialsService;
+
@Override
public void addSlGoodsShelf(SlGoodsMaterialsDTO slGoodsMaterialsDTO) {
@@ -46,7 +52,9 @@
SlGoodsMaterials slGoodsMaterials=new SlGoodsMaterials();
slGoodsMaterials.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
+ slGoodsMaterials.setGoodsMaterialsNo(slGoodsMaterialsDTO.getGoodsMaterialsNo());
slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ this.save(slGoodsMaterials);
}else{
SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){
@@ -54,7 +62,18 @@
}
if (slGoodsMaterialsDTO.getRepertory()!=null){
byId.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(ManagementGoodsMaterials::getGoodsMaterialsId,byId.getId());
+ wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime);
+ List<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.list(wrapper3);
+ for (ManagementGoodsMaterials pg:page1){
+ pg.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ managementGoodsMaterialsService.updateById(pg);
+ }
+
}
+ byId.setGoodsMaterialsNo(slGoodsMaterialsDTO.getGoodsMaterialsNo());
if (slGoodsMaterialsDTO.getIsConsume()!=null){
byId.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
}
@@ -66,7 +85,9 @@
public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&slGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ }
if (slGoodsMaterialsQuery.getIsConsume()!=0){
wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
}
@@ -85,22 +106,39 @@
slVolumeProductionIdList = slVolumeProductionRks.stream().map(SlVolumeProductionRk::getMaterialsId)
.collect(Collectors.toSet());
- Page<SlGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
- LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,storeManagementGoodSmaterialsQuery.getGoodsMaterialsName());
- if (storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
- wrapper.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
+ LambdaQueryWrapper< SlGoodsMaterials> wrapper1 =Wrappers.lambdaQuery();
+ if (storeManagementGoodSmaterialsQuery.getIsConsume()!=null&&storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
+ wrapper1.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
}
+ if (storeManagementGoodSmaterialsQuery.getGoodsMaterialsName()!=null){
+ wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,storeManagementGoodSmaterialsQuery.getGoodsMaterialsName());
+ }
+ List<SlGoodsMaterials> list1 = this.list(wrapper1);
+
+ Set<Long> SlGoodsMaterialsList = null;
+ SlGoodsMaterialsList = list1.stream().map(SlGoodsMaterials::getId)
+ .collect(Collectors.toSet());
+
+
+ Page<ManagementGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
+ LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+
if (slVolumeProductionIdList.size()>0){
- wrapper.in(SlGoodsMaterials::getId,slVolumeProductionIdList);
+ wrapper.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
}
- wrapper.eq( SlGoodsMaterials::getDelFlag,0);
- wrapper.orderByDesc(SlGoodsMaterials::getCreateTime);
- Page<SlGoodsMaterials> page1 = this.page(page, wrapper);
+ if (SlGoodsMaterialsList.size()>0){
+ wrapper.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
+ }
+ wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
+ Page<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.page(page, wrapper);
PageDTO<StoreManagementGoodSmaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, StoreManagementGoodSmaterialsVO.class);
List<StoreManagementGoodSmaterialsVO> list = storeManagementGoodSmaterialsVOPageDTO.getList();
for (StoreManagementGoodSmaterialsVO li:list){
- Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getId());
+ Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getGoodsMaterialsId());
+ SlGoodsMaterials byId = this.getById(li.getGoodsMaterialsId());
+ li.setGoodsMaterialsName(byId.getGoodsMaterialsName());
+ li.setIsConsume(byId.getIsConsume());
li.setAveragePrice(storeManagementGoodSmaterialsOne);
}
--
Gitblit v1.7.1