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 feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-10 17:30:21 +08:00
parent 756bb53a39 da8e40c8bd
commit 67c7f0b3d8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewDQbomParentMapper.java
View File

@ -22,7 +22,7 @@ public interface BomNewDQbomParentMapper extends BaseMapper<BomNewDQbomParentEnt
BomNewDQbomVO getRootBomByRowId(Long rootBomRowId); BomNewDQbomVO getRootBomByRowId(Long rootBomRowId);
List<BomNewDQbomVO> getChildren(Long bomRowId); // List<BomNewDQbomVO> getChildren(Long bomRowId);
List<BomNewDQbomVO> getBom(int status, String materialNo, String drawingNo, String materialName); List<BomNewDQbomVO> getBom(int status, String materialNo, String drawingNo, String materialName);

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

@ -375,7 +375,8 @@ public class DQBomService {
private void getChildren(List<BomNewDQbomVO> datas, BomNewDQbomVO parent) { private void getChildren(List<BomNewDQbomVO> datas, BomNewDQbomVO parent) {
if (Objects.isNull(parent) || parent.getBomRowId() == 0) return; if (Objects.isNull(parent) || parent.getBomRowId() == 0) return;
List<BomNewDQbomVO> cc = dQBomParentService.getBaseMapper().getChildren(parent.getBomRowId()); //List<BomNewDQbomVO> cc = dQBomParentService.getBaseMapper().getChildren(parent.getBomRowId());
List<BomNewDQbomVO> cc = getChild(parent.getBomRowId());
if (CollUtil.isNotEmpty(cc)) { if (CollUtil.isNotEmpty(cc)) {
cc.forEach(c -> { cc.forEach(c -> {
c.setParentMaterialNo(parent.getMaterialNo()); c.setParentMaterialNo(parent.getMaterialNo());