From a1dfac009df7dde97304dafadb25900220e94708 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 17:10:01 +0800 Subject: [PATCH 1/2] =?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 --- .../java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0d60d23..47992feb 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 @@ -29,7 +29,7 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable { * 设计维护部门名称 */ @ApiModelProperty(value = "设计维护部门名称") - private String deptName = SessionUtil.getFullDeptName(); + private String deptName = SessionUtil.getDepartName(); /** * 创建时间 From e3cb052c895f83dc1ce905a9819e778476501901 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 17:12:39 +0800 Subject: [PATCH 2/2] =?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 --- .../service/BomNewEbomParentService.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 6fd59f88..efcf11e3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -2386,7 +2386,23 @@ public class BomNewEbomParentService extends ServiceImpl 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 vos; } public Integer getSapErrorNum() {