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());