From f22e96b99b71cbed426575071e9f828660f8636f Mon Sep 17 00:00:00 2001 From: luoliming Date: Wed, 15 May 2024 11:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/entity/BomNewEbomChildEntity.java | 8 ++++---- .../bomnew/service/domain/OriginalBom/BaseConvert.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java index 57b253cd..d4385a8a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java @@ -226,11 +226,11 @@ public class BomNewEbomChildEntity implements Serializable { private String materialOriginalUnit; - private String materialNoAndProjectType; +// private String materialNoAndProjectType; - public String getMaterialNoAndProjectType() { - return StrUtil.join(materialNo,projectType); - } +// public String getMaterialNoAndProjectType() { +// return StrUtil.join(materialNo,projectType); +// } private static final long serialVersionUID = -14147430944632372L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java index b3add8f8..403fe47e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java @@ -306,10 +306,10 @@ public abstract class BaseConvert { if (oldChildList.size() != newChildList.size()) { return false; } - Map oldChildMap = oldChildList.stream().collect(Collectors.toMap(BomNewEbomChildEntity::getMaterialNoAndProjectType , Function.identity())); + Map > oldChildMap = oldChildList.stream().collect(Collectors.groupingBy(u->StrUtil.join(u.getMaterialNo(),u.getProjectType()) )); for (BomNewEbomChildEntity newChild : newChildList) { String key=StrUtil.join(newChild.getMaterialNo(),newChild.getProjectType()); - if(!oldChildMap.containsKey(key) || Objects.equals(newChild.getNum(), oldChildMap.get(key).getNum()) ){ + if(!oldChildMap.containsKey(key) || Objects.equals(newChild.getNum(), oldChildMap.get(key).get(0).getNum()) ){ return false; } }