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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 

# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
This commit is contained in:
曹鹏飞 2024-06-29 17:01:42 +08:00
parent a6284a7626 f600d1fe2e
commit 079df935de
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -1024,6 +1024,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
if (CollUtil.isNotEmpty(bomChildren)) { if (CollUtil.isNotEmpty(bomChildren)) {
ebomChildService.updateBatchById(bomChildren); ebomChildService.updateBatchById(bomChildren);
} }
//将历史已发布版-转移到正式历史表
if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) {
eBomToFormal(eBomToPBom.getAddEBomNew(), eBomToPBom.getDelOldEBom() );
}
// SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId); // SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
} }