From e91d30d86f642b685f99d904019e3fcf17188339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 7 May 2024 14:13:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8Bebo?= =?UTF-8?q?m=E5=AF=B9=E5=BA=94=E7=9A=84=E5=8E=9F=E5=A7=8Bbom=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 14 ++++++++ .../service/BomNewEbomParentService.java | 32 +++++++++++++++++++ 2 files changed, 46 insertions(+) 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 522c931a..7d149143 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