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

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

This commit is contained in:
曹鹏飞 2024-04-24 15:33:23 +08:00
parent 2998137e35 97401dfbdb
commit 6dae84e4a9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,6 +407,7 @@ public class DQBomService {
BomNewDQbomChildEntity child = dQBomChildService.getById(rowId); BomNewDQbomChildEntity child = dQBomChildService.getById(rowId);
BomNewDQbomVO p = Convert.convert(BomNewDQbomVO.class, child); BomNewDQbomVO p = Convert.convert(BomNewDQbomVO.class, child);
p.setRootIs(0); p.setRootIs(0);
p.setBomRowId(bomRowId);
p.setUserRootIs(0); p.setUserRootIs(0);
p.setRowId(IdWorker.getId()); p.setRowId(IdWorker.getId());
p.setCreatedTime(LocalDateTime.now()); p.setCreatedTime(LocalDateTime.now());
@ -415,7 +416,9 @@ public class DQBomService {
vo.setParent(p); vo.setParent(p);
} else { } else {
BomNewDQbomParentEntity parent = dQBomParentService.getById(bomRowId); BomNewDQbomParentEntity parent = dQBomParentService.getById(bomRowId);
vo.setParent(Convert.convert(BomNewDQbomVO.class, parent)); BomNewDQbomVO p = Convert.convert(BomNewDQbomVO.class, parent);
p.setBomRowId(bomRowId);
vo.setParent(p);
vo.setDatas(getChild(bomRowId)); vo.setDatas(getChild(bomRowId));
} }
return vo; return vo;