diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java index 56851e67..793a59f2 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java @@ -107,7 +107,10 @@ public class BomNewPBomVO extends BaseMaterialVO { }else { return expireEndTime; } - } + } + private String parentMaterialNo; + + private String parentMaterialDesc; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java index 15daa51e..6fed3dd8 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java @@ -85,4 +85,7 @@ public class ProcessRouteTaskVO extends BaseMaterialVO implements Serializable { // 组件分配列表 private List assemblyVOList; + + // 保存类型 tempSave 不校验, validSave 校验 + private String saveType; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java index a94af7e7..14040321 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java @@ -92,11 +92,25 @@ public class ProcessRouteTaskService extends ServiceImpl existsTaskList = this.lambdaQuery().eq(ProcessRouteTaskEntity::getFactory, processRouteTaskVO.getFactory()) .eq(ProcessRouteTaskEntity::getMaterialNo, processRouteTaskVO.getMaterialNo()) @@ -178,15 +192,19 @@ public class ProcessRouteTaskService extends ServiceImpl nodeList = showDataStyle(convertBomList, rootParent.getRowId()); for (BomNewPBomVO vo: nodeList) { vo.setBomVersion(rootParent.getCurrentVersion()); - // vo.setDeviseName(parentFormal.getDeviseName()); - // vo.setCreatedTime(parentFormal.getCreatedTime()); - // vo.setExpireEndTime(parentFormal.getReleaseTime()); - // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料,版本号显示B00 by 10002327 241101 -// if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){ -// vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM); -// } } nodesList.addAll(nodeList); + if (CollUtil.isNotEmpty(nodesList)) { + nodesList.forEach(item -> { + List parents = nodesList.stream().filter(parent -> item.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(parents)) { + item.setParentMaterialNo(parents.get(0).getMaterialNo()); + item.setParentMaterialDesc(parents.get(0).getMaterialDesc()); + } + }); + // 最顶级不返回 + nodesList.remove(0); + } return nodesList; } diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml index 64398f36..a07bb47d 100644 --- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml +++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml @@ -48,7 +48,13 @@ AND updated_by LIKE concat('%', #{query.updatedBy}, '%') - AND del_flag = #{delFlag} + AND del_flag = #{query.delFlag} + + + AND `status` = #{query.status} + + + AND usefulness = #{query.usefulness}