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 7eb6d4f3..00b5f29e 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 @@ -27,11 +27,13 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.ttzero.excel.entity.ListSheet; import org.ttzero.excel.entity.Workbook; +import springfox.bean.validators.plugins.schema.NotNullAnnotationPlugin; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.util.List; import java.util.Objects; @@ -68,6 +70,7 @@ public class EbomApi extends BaseApi { @Resource private BomNewPbomParentService bomNewPbomParentService; + private NotNullAnnotationPlugin notNullPlugin; @PostMapping("workDetailsListByPage") @@ -473,4 +476,15 @@ public class EbomApi extends BaseApi { public ResultVO> getBomException(@Valid @RequestBody @NotEmpty List query) { return ResultVO.success(bomNewEbomParentService.getBomException(query)); } + + /** + * 获取对应的原始bom + * @param rowId rowId + * @return 原始bom + */ + @GetMapping("getSource") + @ApiOperation("获取对应的原始bom") + public ResultVO getSource(@Valid @RequestParam("rowId") @NotNull Long rowId) { + return ResultVO.success(bomNewEbomParentService.getSource(rowId)); + } } 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 0db77633..9aff27fe 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 @@ -98,6 +98,12 @@ public class BomNewEbomParentService extends ServiceImpl