Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
This commit is contained in:
commit
2dd82046fe
|
|
@ -1237,10 +1237,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
|
|
||||||
List<Long> oldPBomRowIds = toParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
|
List<Long> oldPBomRowIds = toParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
|
||||||
List<Long> toFormalPBomRowIds = new ArrayList<>();
|
List<Long> toFormalPBomRowIds = new ArrayList<>();
|
||||||
toFormalPBomRowIds.addAll(exceptRowIds);
|
|
||||||
toFormalPBomRowIds.addAll(oldPBomRowIds);
|
this.getBaseMapper().insertPBomParentToFormal(exceptRowIds);
|
||||||
this.getBaseMapper().insertPBomParentToFormal(toFormalPBomRowIds);
|
this.getBaseMapper().insertPBomChildToFormal(exceptRowIds);
|
||||||
this.getBaseMapper().insertPBomChildToFormal(toFormalPBomRowIds);
|
|
||||||
|
|
||||||
//转移后删除
|
//转移后删除
|
||||||
this.getBaseMapper().delPBom(oldPBomRowIds);
|
this.getBaseMapper().delPBom(oldPBomRowIds);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue