From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
index c7fcd92..aa61c7d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
@@ -50,6 +50,9 @@
if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){
wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName());
}
+ if (managementGoodsMaterialsQuery.getStoreManagementGrade()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,managementGoodsMaterialsQuery.getStoreManagementGrade());
+ }
if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null&&managementGoodsMaterialsQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,managementGoodsMaterialsQuery.getStoreManagementNo());
}
@@ -78,7 +81,6 @@
SlGoodsMaterialsList = slGoodsMaterials.stream().map(SlGoodsMaterials::getId)
.collect(Collectors.toSet());
-
Page<ManagementGoodsMaterials> page = new Page<>(managementGoodsMaterialsQuery.getPageCurr(), managementGoodsMaterialsQuery.getPageSize());
LambdaQueryWrapper< ManagementGoodsMaterials> wrapper3= Wrappers.lambdaQuery();
@@ -87,7 +89,7 @@
}else{
slVolumeProductionIdList=new HashSet<>();
slVolumeProductionIdList.add(0L);
- wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionIdList);
+ wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
}
if (SlGoodsMaterialsList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
@@ -96,8 +98,8 @@
SlGoodsMaterialsList.add(0L);
wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
}
- wrapper3.apply("repertory_zhai<repertory");
- wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper3.apply("repertory_zhai <repertory");
+ wrapper3.eq(ManagementGoodsMaterials::getDelFlag,0);
wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime);
Page<ManagementGoodsMaterials> page1 = this.page(page, wrapper3);
PageDTO<ManagementGoodsMaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, ManagementGoodsMaterialsVO.class);
@@ -106,8 +108,6 @@
SlGoodsMaterials slGoodsMaterials1 = slGoodsMaterialsMapper.selectById(li.getGoodsMaterialsId());
li.setGoodsMaterialsName(slGoodsMaterials1.getGoodsMaterialsName());
li.setIsConsume(slGoodsMaterials1.getIsConsume());
- li.setRepertory(slGoodsMaterials1.getRepertory());
-
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(li.getManagementId());
li.setProvinceCode(slStoreManagement.getProvinceCode());
li.setStoreManagementName(slStoreManagement.getStoreManagementName());
--
Gitblit v1.7.1