diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index ca2e1837..dca286ac 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -301,8 +301,7 @@ public class EbomApi extends BaseApi { @ApiOperation("编辑物料列表") public ResultVO editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId , @RequestParam("projectType") String projectType - , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage - , @RequestParam("parentBomRowId") Long parentBomRowId) { + , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) { if (Objects.isNull(rowId)) { VUtils.isTure(true).throwMessage("rowId 不能为空"); } @@ -310,7 +309,7 @@ public class EbomApi extends BaseApi { 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") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java index ea9894dd..03835bd4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java @@ -25,10 +25,4 @@ public class BomNewEbomEditDetailVO implements Serializable { */ @ApiModelProperty("当前节点的子级") private List datas; - - /* - * 当前节点的上级节点 - */ - @ApiModelProperty("当前节点的上级节点") - private BomNewEbomParentVO parentParent; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 2106bb64..e440a047 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1580,7 +1580,7 @@ public class BomNewEbomParentService extends ServiceImpl