rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
大米 2024-04-17 18:21:06 +08:00
parent 92c7d63a04 fe7507e819
commit 34b9282301
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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