rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+正式版查询条件

This commit is contained in:
jing's 2024-07-06 17:56:01 +08:00
parent d502130f01
commit bd41892bbc
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
View File

@ -10,6 +10,7 @@ import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.ImmutableList;
import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.ReportConstant;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
@ -105,6 +106,7 @@ public class EBomForwardReport extends BaseForwardReport {
if (isNewVersion()) {
QueryWrapper<BomNewEbomParentEntity> queryWrapper = new QueryWrapper<>();
buildQueryParam(queryWrapper);
queryWrapper .eq(FieldGetterUtil.getFieldInfo(BomNewEbomParentEntity::getStatus), EBomStatusEnum.PUBLISHED.getValue());
List<BomNewEbomParentEntity> list = SpringUtil.getBean(BomNewEbomParentService.class).list(queryWrapper);
rlist = Convert.convert(new TypeReference<List<BomNewEbomParentVO>>() {
}, list);

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.PBomStatusEnum;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
@ -82,6 +83,9 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
List<BomNewPbomParentEntity> childBomlist = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery()
.in(BomNewPbomParentEntity::getMaterialNo, materialNos)
.ge( BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue())
.eq(BomNewPbomParentEntity::getFacCode, facCode).list();
Map<String, BomNewPbomParentEntity> parentMap = childBomlist.stream()
.collect(Collectors.groupingBy(

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.ImmutableList;
import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.PBomStatusEnum;
import com.nflg.product.bomnew.constant.ReportConstant;
import com.nflg.product.bomnew.mapper.master.BomNewPbomParentMapper;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
@ -159,7 +160,11 @@ public class PBomForwardReport extends BaseForwardReport {
if (isNewVersion()) {
QueryWrapper<BomNewPbomParentEntity> queryWrapper = new QueryWrapper<>();
buildQueryParam(queryWrapper);
List<BomNewPbomParentEntity> list = SpringUtil.getBean(BomNewPbomParentService.class).list(queryWrapper);
queryWrapper.ge( FieldGetterUtil.getFieldInfo(BomNewPbomParentEntity::getStatus), PBomStatusEnum.PUBLISH.getValue());
List<BomNewPbomParentEntity> list = SpringUtil.getBean(BomNewPbomParentService.class)
.list(queryWrapper);
rlist = Convert.convert(new TypeReference<List<BomNewPbomParentVO>>() {
}, list);
} else {