diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java index e324b207..ceb3ce4f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java @@ -84,16 +84,18 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl newPBomRowIds = updateImpact.getPBomParentResult().stream().map(u -> u.getRowId()).collect(Collectors.toList()); + pbomParentService.getBaseMapper().insertPBomParentToFormal(newPBomRowIds); + pbomParentService.getBaseMapper().insertPBomChildToFormal(newPBomRowIds); } if (CollUtil.isNotEmpty(updateImpact.getPBomChildResult())) { pbomChildService.saveOrUpdateBatch(updateImpact.getPBomChildResult()); } //旧版PBOM移动到历史表中 if (CollUtil.isNotEmpty(updateImpact.getOldPBomList())) { - List oldPBomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList()); - pbomParentService.getBaseMapper().insertPBomParentToFormal(oldPBomRowIds); - pbomParentService.getBaseMapper().insertPBomChildToFormal(oldPBomRowIds); - pbomParentService.getBaseMapper().delPBom(oldPBomRowIds); + List oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList()); + pbomParentService.getBaseMapper().delPBom(oldPbomRowIds); } } }