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] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5SAP?= =?UTF-8?q?=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;