From f4aae74c93226b122e61db42746110ca0b014df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 21 Aug 2024 08:57:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?SAP=E6=97=B6=E7=9A=84=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewEbomExportToSAP.java | 4 ++-- .../product/bomnew/service/BomNewPbomExportToSAPImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java index fa6ae997..850f3c31 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java @@ -174,7 +174,7 @@ public class BomNewEbomExportToSAP { BomNewEbomParentEntity p = bomNewEbomParentService.lambdaQuery() .select(BomNewEbomParentEntity::getRowId, BomNewEbomParentEntity::getMaterialNo , BomNewEbomParentEntity::getMaterialDesc, BomNewEbomParentEntity::getUserRootIs - , BomNewEbomParentEntity::getSource) + , BomNewEbomParentEntity::getSource, BomNewEbomParentEntity::getSapState) .eq(BomNewEbomParentEntity::getMaterialNo, c.getMaterialNo()) // .eq(BomNewEbomParentEntity::getUserRootIs, 0) .eq(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) @@ -182,7 +182,7 @@ public class BomNewEbomExportToSAP { .orderByDesc(BomNewEbomParentEntity::getCurrentVersion) .last(" limit 1") .one(); - if (Objects.nonNull(p) && p.getSapState() >= SapStatusEnum.PUB_ERROR.getValue()) { + if (Objects.nonNull(p) && Objects.nonNull(p.getSapState()) && p.getSapState() >= SapStatusEnum.PUB_ERROR.getValue()) { liPIds.add(p.getRowId()); } return p; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 87f1d3d5..d64b9441 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -341,7 +341,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { .orderByDesc(BomNewPbomParentEntity::getCurrentVersion) .last(" limit 1") .one(); - if (Objects.nonNull(parent) && parent.getSapState() >= SapStatusEnum.PUB_ERROR.getValue()) { + if (Objects.nonNull(parent) && Objects.nonNull(parent.getSapState()) && parent.getSapState() >= SapStatusEnum.PUB_ERROR.getValue()) { liPIds.add(parent.getRowId()); } return parent; From be8d4fab44c10ae683a689d8e799e5dd60d311e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 22 Aug 2024 16:22:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?SAP=E6=97=B6=E6=B7=BB=E5=8A=A0=E7=9B=B4=E5=8F=91=E5=8C=85parent?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomExportToSAPImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index d64b9441..bf602071 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -160,6 +160,10 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { } private BomNewPbomParentEntity addZFBParent(BomNewPbomChildEntity child) { + BomNewPbomParentEntity tp = bomNewPbomParentService.lambdaQuery() + .eq(BomNewPbomParentEntity::getMaterialNo, child.getMaterialNo()) + .eq(BomNewPbomParentEntity::getFacCode, child.getFacCode()) + .one(); BomNewPbomParentEntity parent = new BomNewPbomParentEntity(); parent.setRowId(IdWorker.getId()); parent.setCreatedTime(LocalDateTime.now()); @@ -170,7 +174,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { parent.setBatchNo(""); parent.setCreatedBy(SessionUtil.getUserCode()); parent.setCreatedJob(UserJobEnum.ENGINEER.getValue()); - parent.setCurrentVersion(VersionUtil.getNextVersion("")); + parent.setCurrentVersion(Objects.isNull(tp) ? VersionUtil.getNextVersion("") : VersionUtil.getNextVersion(tp.getCurrentVersion())); parent.setDeptRowId(SessionUtil.getDepartRowId()); parent.setDeptName(SessionUtil.getDepartName()); parent.setDeviseName(SessionUtil.getRealName()); From 982dc6821ec4f71ea863709ed11d5ad4d99de608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 22 Aug 2024 16:27:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?SAP=E6=97=B6=E6=B7=BB=E5=8A=A0=E7=9B=B4=E5=8F=91=E5=8C=85parent?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomExportToSAPImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index bf602071..db3ea11b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -174,7 +174,13 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { parent.setBatchNo(""); parent.setCreatedBy(SessionUtil.getUserCode()); parent.setCreatedJob(UserJobEnum.ENGINEER.getValue()); - parent.setCurrentVersion(Objects.isNull(tp) ? VersionUtil.getNextVersion("") : VersionUtil.getNextVersion(tp.getCurrentVersion())); + if (Objects.isNull(tp)) { + parent.setCurrentVersion(VersionUtil.getNextVersion("")); + } else { + parent.setCurrentVersion(tp.getCurrentVersion()); + tp.setCurrentVersion(VersionUtil.getNextVersion(tp.getCurrentVersion())); + bomNewPbomParentService.updateById(tp); + } parent.setDeptRowId(SessionUtil.getDepartRowId()); parent.setDeptName(SessionUtil.getDepartName()); parent.setDeviseName(SessionUtil.getRealName()); From 7061e032a961f611f307e33074db87eed541b7bd Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 22 Aug 2024 16:47:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?pbom=E5=8F=91=E8=B5=B7=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java index a2a96724..99a2cbe6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java @@ -98,7 +98,6 @@ public class PBomUpgrade { pbomParent.setTechnologyUserCode(SessionUtil.getUserCode()); pbomParent.setRemark(""); pbomParent.setSource(PbomSourceEnum.FROM_CHANGE.getValue()); - pbomParent.setSourceStatus(PbomSourceStatusEnum.PBOM.getValue()); pbomParent.setReleaseTime(null); pbomParent.setReleaseUserName(null); pbomParent.setSapState(1); @@ -135,7 +134,6 @@ public class PBomUpgrade { child.setCreatedBy(SessionUtil.getUserCode()); child.setModifyTime(null); child.setSource(PbomSourceEnum.FROM_CHANGE.getValue()); - child.setSourceStatus(PbomSourceStatusEnum.PBOM.getValue()); child.setRemark(""); this.childResult.add(child); }