From 423a89e038359d2f17f8fe4c654d4471148fb488 Mon Sep 17 00:00:00 2001 From: 10002327 Date: Fri, 1 Nov 2024 20:06:07 +0800 Subject: [PATCH] =?UTF-8?q?5=E3=80=81BOM=E6=9F=A5=E7=9C=8B=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E8=B5=8B=E5=80=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96=206=E3=80=81PBOM=E5=B7=A5=E4=BD=9C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9C=A8=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E3=80=81=E5=9B=BE=E5=8F=B7=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E5=B7=A5=E5=8E=82=E5=92=8C=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewPbomParentService.java | 8 +++++--- .../bomnew/service/ForwardReportService.java | 19 +++++++++++++++++++ .../domain/EBom/EBomForwardReport.java | 13 +++++++++++++ .../domain/PBom/PBomForwardReport.java | 14 ++++++++++++-- .../mapper/master/BomNewPbomParentMapper.xml | 5 ++++- 5 files changed, 53 insertions(+), 6 deletions(-) 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 2fd8efd4..4381b257 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 @@ -150,10 +150,12 @@ public class BomNewPbomParentService extends ServiceImpl parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo,SessionUtil.getUserCode()); - List childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo,SessionUtil.getUserCode()); + List parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo,""); + List childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo,""); List data = new ArrayList<>(); data.addAll(parents); data.addAll(childs); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java index 98d11100..6a8c3f01 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java @@ -250,6 +250,15 @@ public class ForwardReportService { vo.setCurrentVersion(parentEntity.getCurrentVersion()); vo.setExpireEndTime(parentEntity.getExpireEndTime()); } + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { + vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); + } else { + vo.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); + } + // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // } @@ -338,6 +347,16 @@ public class ForwardReportService { vo.setCurrentVersion(parentEntity.getCurrentVersion()); // vo.setCreatedBy(parentEntity.getCreatedBy()); } + + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + }else if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { + vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); + } else { + vo.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); + } + // if (MaterialshouldBomExistUtil.checkShouldBomExist(vo)) { // vo.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); // } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index 19158305..0d5d9e84 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -310,6 +310,11 @@ public class EBomForwardReport extends BaseForwardReport { initMaterialInfo(nodeList); nodeList.forEach(item->{ item.setBomVersion(parentFormal.getCurrentVersion()); + + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ + item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } }); nodesList.addAll(nodeList); @@ -486,6 +491,10 @@ public class EBomForwardReport extends BaseForwardReport { vo.setBomVersion(parentFormal.getCurrentVersion()); // vo.setDeviseName(parentFormal.getDeviseName()); // vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } } nodesList.addAll(nodeList); @@ -525,6 +534,10 @@ public class EBomForwardReport extends BaseForwardReport { // vo.setLevelNum(1); vo.setOrderNumber(orderNum.incrementAndGet() + ""); + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } } nodesList.addAll(nodeList); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index a7a605e0..8e2cb43e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -323,6 +323,10 @@ public class PBomForwardReport extends BaseForwardReport { initMaterialInfo(nodeList); nodeList.forEach(item->{ item.setBomVersion(parentFormal.getCurrentVersion()); + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(item)){ + item.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } }); nodesList.addAll(nodeList); @@ -516,7 +520,10 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setDeviseName(parentFormal.getDeviseName()); // vo.setCreatedTime(parentFormal.getCreatedTime()); // vo.setExpireEndTime(parentFormal.getReleaseTime()); - + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } } nodesList.addAll(nodeList); } @@ -553,7 +560,10 @@ public class PBomForwardReport extends BaseForwardReport { // vo.setLevelNum(1); vo.setOrderNumber(orderNum.incrementAndGet() + ""); - + // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101 + if(MaterialshouldBomExistUtil.checkNoNeedBom(vo)){ + vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); + } } nodesList.addAll(nodeList); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml index d6b842ba..db7a86c6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml @@ -212,7 +212,10 @@