Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java

@@ -42,6 +42,8 @@ public class EBomEdit {
     private BomNewEbomParentEntity parentEntity;
     @Getter
     private boolean isRootForWaitReview=false;
+    @Getter
+    private  boolean isNewBom=false;
 
     public List<BomNewEbomChildEntity> childEntities;
 
@@ -91,6 +93,7 @@ public class EBomEdit {
             isRootForWaitReview=true;
         }
 
+        isNewBom=true;
         parent.setCreatedTime(LocalDateTime.now());
         parent.setModifyTime(LocalDateTime.now());
 
@@ -335,6 +338,11 @@ public class EBomEdit {
 
 
     public  void nextVersion(){
+
+        if(!isNewBom){
+            return;
+        }
+        //缺bom，新建的bom 版本增加
         //同一物料且存在一个 lastVersionIs=1
         if(ObjectUtil.isNotNull(getParentEntity().getLastVersionIs())
                 && ObjectUtil.equal(getParentEntity().getLastVersionIs(),1)) {