diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 3d7455dd..19523798 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1605,8 +1605,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 queryWrapper.lambda().eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo());
                 queryWrapper.lambda().eq(BomNewEbomParentEntity::getLastVersionIs, 1);
                 queryWrapper.lambda().notIn(BomNewEbomParentEntity::getRowId, eBomEdit.getParentEntity().getRowId());
-
-
+                BomNewEbomParentEntity  oldParent=  this.getOne(queryWrapper);
+                if(oldParent!=null){
+                    eBomEdit.getParentEntity().setCurrentVersion(oldParent.getCurrentVersion());
+                    BomNewEbomParentEntity updateOld=new BomNewEbomParentEntity();
+                    updateOld.setLastVersionIs(0);
+                    updateOld.setModifyTime(LocalDateTime.now());
+                    updateOld.setRowId(oldParent.getRowId());
+                    this.updateById(updateOld);
+                }
 
             }
 
@@ -1663,6 +1670,25 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         if (eBomEdit.getParentEntity() != null) {
+
+            if(ObjectUtil.isNotNull(eBomEdit.getParentEntity().getLastVersionIs()) && ObjectUtil.equal(eBomEdit.getParentEntity().getLastVersionIs(),1)) {
+                QueryWrapper<BomNewEbomParentEntity> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo());
+                queryWrapper.lambda().eq(BomNewEbomParentEntity::getLastVersionIs, 1);
+                queryWrapper.lambda().notIn(BomNewEbomParentEntity::getRowId, eBomEdit.getParentEntity().getRowId());
+                BomNewEbomParentEntity  oldParent=  this.getOne(queryWrapper);
+                if(oldParent!=null){
+                    eBomEdit.getParentEntity().setCurrentVersion(oldParent.getCurrentVersion());
+                    BomNewEbomParentEntity updateOld=new BomNewEbomParentEntity();
+                    updateOld.setLastVersionIs(0);
+                    updateOld.setModifyTime(LocalDateTime.now());
+                    updateOld.setRowId(oldParent.getRowId());
+                    this.updateById(updateOld);
+                }
+
+            }
+
+
             this.saveOrUpdate(eBomEdit.getParentEntity());
 
         }