From cf9239991d6a3c09605fc8b51b38cf4bef49404c Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 14 Nov 2024 10:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90POBM=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA=E4=B8=BA=E4=BB=99?= =?UTF-8?q?=E6=A1=83=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=88=901010=E7=9A=84bom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/BomNewEbomParentMapper.java | 7 +++++++ .../mapper/master/BomNewPbomParentMapper.java | 7 +++++++ .../service/BomNewEbomParentService.java | 18 +++++++++++++++++- .../service/BomNewPbomParentService.java | 2 +- .../service/domain/EBom/EBomToPbomBase.java | 12 ++++++++++++ .../mapper/master/BomNewEbomParentMapper.xml | 7 +++++++ .../mapper/master/BomNewPbomParentMapper.xml | 7 +++++++ 7 files changed, 58 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 663e9441..25e6fdb5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -124,6 +124,13 @@ public interface BomNewEbomParentMapper extends BaseMapper getLatestByMaterialNo(Collection materialNos); @Deprecated void updateLastVersionIs(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java index 4be88ee8..a7a57d9e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java @@ -79,6 +79,13 @@ public interface BomNewPbomParentMapper extends BaseMapper getReverseBoms(Long parentRowId); /** 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 5417c594..1c32f504 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 @@ -983,6 +983,8 @@ public class BomNewEbomParentService extends ServiceImpl parents = this.getBaseMapper().selectBatchIds(paramDto.getBomRowIds()); + String factory = userRoleService.getUserFactory(); + parents.forEach(p -> { if (p.getMaterialNo().startsWith("31")) { List errors = new ArrayList<>(); @@ -1014,6 +1016,12 @@ public class BomNewEbomParentService extends ServiceImpl Objects.equals("1010",bom.getFacCode())).collect(Collectors.toList())); + eBomToPBom.getPBomChildResult().removeAll(eBomToPBom.getPBomChildResult().stream().filter(bom -> Objects.equals("1010",bom.getFacCode())).collect(Collectors.toList())); + } + //1、删掉pbom 父级的数据 List pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) || (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作"))).collect(Collectors.toList()); @@ -1177,6 +1185,8 @@ public class BomNewEbomParentService extends ServiceImpl parents = this.getBaseMapper().selectBatchIds(paramDto.getBomRowIds()); + String factory = userRoleService.getUserFactory(); + parents.forEach(p -> { if (p.getMaterialNo().startsWith("31")) { List errors = new ArrayList<>(); @@ -1222,6 +1232,12 @@ public class BomNewEbomParentService extends ServiceImpl Objects.equals("1010",bom.getFacCode())).collect(Collectors.toList())); + eBomToPBom.getPBomChildResult().removeAll(eBomToPBom.getPBomChildResult().stream().filter(bom -> Objects.equals("1010",bom.getFacCode())).collect(Collectors.toList())); + } + //1、删掉pbom 父级的数据 List pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) || (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作"))).collect(Collectors.toList()); @@ -3173,7 +3189,7 @@ public class BomNewEbomParentService extends ServiceImpl getSapError(Long rowId) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 8536d3a2..f569deff 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -1968,7 +1968,7 @@ public class BomNewPbomParentService extends ServiceImpl getSapError(Long rowId) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 84d75061..6cc12c05 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -209,6 +209,10 @@ public abstract class EBomToPbomBase { if(StrUtil.isNotBlank(parentVo.getEbomVersion())){ oldParent.setCurrentVersion(parentVo.getEbomVersion()); } + //父级BOM 不应有该序号和项目类别都是空值，数量肯定是1 by 10002327 241113 + oldParent.setOrderNumber(null); + oldParent.setProjectType(null); + oldParent.setNum(new BigDecimal(1)); this.pBomParentResult.add(oldParent); return oldParent; } @@ -352,10 +356,18 @@ public abstract class EBomToPbomBase { if(StrUtil.isNotBlank(parentVo.getEbomVersion()) ){ pBomParent.setCurrentVersion(parentVo.getEbomVersion()); } + //父级BOM 不应有该序号和项目类别都是空值，数量肯定是1 by 10002327 241113 + pBomParent.setOrderNumber(null); + pBomParent.setProjectType(null); + pBomParent.setNum(new BigDecimal(1)); if (Objects.nonNull(oldParent)) { oldParent.setExpireEndTime(LocalDateTime.now()); oldParent.setLastVersionIs(0); + + oldParent.setOrderNumber(null); + oldParent.setProjectType(null); + oldParent.setNum(new BigDecimal(1)); this.pBomParentResult.add(oldParent); } this.pBomParentResult.add(pBomParent); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 84472853..422fce18 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -609,6 +609,13 @@ INNER JOIN t_bom_new_sap_error_msg e ON p.row_id = e.target_row_id AND e.type = 0 WHERE p.created_by = #{userCode} + +