调整新加bom 最新版调整
This commit is contained in:
parent
d0050dd1ad
commit
17293e495d
|
|
@ -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());
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue