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

This commit is contained in:
曹鹏飞 2024-06-04 09:18:23 +08:00
parent 5a51f0957d 30abb6a9cb
commit 5e85f73b2b
3 changed files with 3 additions and 11 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/api/user/EbomApi.java
View File

@ -301,8 +301,7 @@ public class EbomApi extends BaseApi {
@ApiOperation("编辑物料列表") @ApiOperation("编辑物料列表")
public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId
, @RequestParam("projectType") String projectType , @RequestParam("projectType") String projectType
, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) {
, @RequestParam("parentBomRowId") Long parentBomRowId) {
if (Objects.isNull(rowId)) { if (Objects.isNull(rowId)) {
VUtils.isTure(true).throwMessage("rowId 不能为空"); VUtils.isTure(true).throwMessage("rowId 不能为空");
} }
@ -310,7 +309,7 @@ public class EbomApi extends BaseApi {
VUtils.isTure(true).throwMessage("bomRowId不能为空"); VUtils.isTure(true).throwMessage("bomRowId不能为空");
} }
return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage, parentBomRowId)); return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage));
} }
@PostMapping("updateProjectType") @PostMapping("updateProjectType")

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java
View File

@ -25,10 +25,4 @@ public class BomNewEbomEditDetailVO implements Serializable {
*/ */
@ApiModelProperty("当前节点的子级") @ApiModelProperty("当前节点的子级")
private List<BomNewEbomParentVO> datas; private List<BomNewEbomParentVO> datas;
/*
* 当前节点的上级节点
*/
@ApiModelProperty("当前节点的上级节点")
private BomNewEbomParentVO parentParent;
} }

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

@ -1580,7 +1580,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
return true; return true;
} }
public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage, Long parentBomRowId) { public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage) {
BomNewEbomEditDetailVO vo = new BomNewEbomEditDetailVO(); BomNewEbomEditDetailVO vo = new BomNewEbomEditDetailVO();
BomNewEbomParentVO parentVO; BomNewEbomParentVO parentVO;
@ -1632,7 +1632,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
vo.setParent(parentVO); vo.setParent(parentVO);
vo.setParentParent(Convert.convert(BomNewEbomParentVO.class, this.getBaseMapper().selectById(parentBomRowId)));
return vo; return vo;
} }