From 13723d344229117ff22fbed86a22a994a0313c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 27 May 2024 18:08:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?optimize(ebom):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java index 47992feb..b54b160a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java @@ -10,6 +10,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.Objects; /** * @author 曹鹏飞 @@ -65,6 +66,9 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable { private BigDecimal unitWeight; public BigDecimal getUnitWeight() { + if (Objects.nonNull(unitWeight)) { + return unitWeight; + } return getMaterialWeight(); } } From fd3524de70709c828c30027e7df5b2688d95e966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 28 May 2024 09:27:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?optimize(dqbom):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/DQBomService.java | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 68b1e08c..1aab635a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -683,23 +683,28 @@ public class DQBomService { if (CollUtil.isNotEmpty(keys)) { datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys)); } - List vos = Convert.toList(QueryMaterialsVO.class, datas); - query.forEach(it -> { - if (Objects.nonNull(it.getUnitWeight()) || StrUtil.isNotBlank(it.getProjectType())) { - QueryMaterialsVO vo = vos.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), it.getMaterialNo()) - || StrUtil.equals(m.getDrawingNo(), it.getDrawingNo())) - .findFirst().orElse(null); - if (Objects.nonNull(vo)) { - if (Objects.nonNull(it.getUnitWeight())) { - vo.setUnitWeight(it.getUnitWeight()); - } - if (StrUtil.isNotBlank(it.getProjectType())) { - vo.setProjectType(it.getProjectType()); - } - } + return datas.stream().map(d -> { + QueryMaterialsVO vo = new QueryMaterialsVO(); + vo.setMaterialNo(d.getMaterialNo()); + vo.setMaterialName(d.getMaterialName()); + vo.setMaterialDesc(d.getMaterialDesc()); + vo.setUnitWeight(d.getMaterialWeight()); + vo.setMaterialCategoryCode(d.getMaterialCategoryCode()); + vo.setMaterialState(d.getMaterialState()); + vo.setDrawingNo(d.getDrawingNo()); + vo.setMaterialTexture(d.getMaterialTexture()); + vo.setMaterialUnit(d.getMaterialUnit()); + vo.setCategoryName(d.getCategoryName()); + QueryMaterialsQuery q = query.stream() + .filter(f -> StrUtil.equals(f.getMaterialNo(), vo.getMaterialNo()) || StrUtil.equals(f.getDrawingNo(), vo.getDrawingNo())) + .findFirst() + .orElse(null); + if (Objects.nonNull(q)) { + vo.setUnitWeight(q.getUnitWeight()); + vo.setProjectType(q.getProjectType()); } - }); - return vos; + return vo; + }).collect(Collectors.toList()); } public QueryMaterialsVO queryMaterial(QueryMaterialsQuery query) { @@ -710,7 +715,18 @@ public class DQBomService { vos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(Collections.singletonList(query.getDrawingNo())); } if (CollUtil.isNotEmpty(vos)) { - QueryMaterialsVO vo = Convert.convert(QueryMaterialsVO.class, vos.get(0)); + BaseMaterialVO d = vos.get(0); + QueryMaterialsVO vo = new QueryMaterialsVO(); + vo.setMaterialNo(d.getMaterialNo()); + vo.setMaterialName(d.getMaterialName()); + vo.setMaterialDesc(d.getMaterialDesc()); + vo.setUnitWeight(d.getMaterialWeight()); + vo.setMaterialCategoryCode(d.getMaterialCategoryCode()); + vo.setMaterialState(d.getMaterialState()); + vo.setDrawingNo(d.getDrawingNo()); + vo.setMaterialTexture(d.getMaterialTexture()); + vo.setMaterialUnit(d.getMaterialUnit()); + vo.setCategoryName(d.getCategoryName()); if (Objects.nonNull(query.getUnitWeight())) { vo.setUnitWeight(query.getUnitWeight()); } From b71ca6e6a7db56060911701d731a79555613eb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 28 May 2024 13:33:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?optimize(dqbom):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nflg/product/bomnew/service/DQBomService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 1aab635a..4c75d060 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -695,6 +695,7 @@ public class DQBomService { vo.setMaterialTexture(d.getMaterialTexture()); vo.setMaterialUnit(d.getMaterialUnit()); vo.setCategoryName(d.getCategoryName()); + vo.setRelCategoryCode(d.getRelCategoryCode()); QueryMaterialsQuery q = query.stream() .filter(f -> StrUtil.equals(f.getMaterialNo(), vo.getMaterialNo()) || StrUtil.equals(f.getDrawingNo(), vo.getDrawingNo())) .findFirst() @@ -727,6 +728,7 @@ public class DQBomService { vo.setMaterialTexture(d.getMaterialTexture()); vo.setMaterialUnit(d.getMaterialUnit()); vo.setCategoryName(d.getCategoryName()); + vo.setRelCategoryCode(d.getRelCategoryCode()); if (Objects.nonNull(query.getUnitWeight())) { vo.setUnitWeight(query.getUnitWeight()); }