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 3189bde5..b1ee0fe1 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 @@ -170,5 +170,19 @@ public class EbomApi extends BaseApi { } + @PostMapping("reviewDesign") + @ApiOperation("设计复核") + public ResultVO reviewDesign(@RequestBody BomNewEBomRevertDTO dto) { + if (CollectionUtil.isEmpty(dto.getRowIdList())) { + return ResultVO.error(STATE.ParamErr, "请选择要复核的数据"); + } + dto.setRevertUserName(SessionUtil.getUserName()); + bomNewEbomParentService.designReview(dto); + + return ResultVO.success(true); + + } + + } 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 4786b29c..44d099b9 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 @@ -29,6 +29,7 @@ import com.nflg.product.bomnew.pojo.vo.EbomExcelVO; import com.nflg.product.bomnew.service.domain.EBom.*; import com.nflg.product.bomnew.util.*; import nflg.product.common.constant.STATE; +import nflg.product.common.vo.ResultVO; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -274,6 +275,12 @@ public class BomNewEbomParentService extends ServiceImpl buildBomTree(Long rowId) throws Exception{ + return getBomTree(rowId); + } + + + /** * 初始化-项目类别 */ @@ -488,4 +495,58 @@ public class BomNewEbomParentService extends ServiceImpl designReview(BomNewEBomRevertDTO dto){ + + List rowIds = dto.getRowIdList(); + + List bomNewEbomParentEntityList = this.getBaseMapper().selectBatchIds(rowIds); + if (CollUtil.isEmpty(bomNewEbomParentEntityList)) { + + return ResultVO.error("下级BOM无法进行复核"); + } + + if (rowIds.size() != bomNewEbomParentEntityList.size()) { + + return ResultVO.error("选择数据中包含有下级BOM无法进行复核"); + } + + for (BomNewEbomParentEntity item: + bomNewEbomParentEntityList) { + if(item.getStatus().equals(EBomStatusEnum.CHECKED.getValue())){ + continue; + } + + if( item.getNum().equals(EBomExceptionStatusEnum.INIT.getValue())){ + return ResultVO.error("请调整数据后进行复核"); + } + + + + + if(StrUtil.isEmpty(item.getMaterialNo()) || (item.getNum()==null||item.getNum().floatValue()==0) ){ + return ResultVO.error(EBomExceptionStatusEnum.EXCEPT_NO_4.getDescription()); + } + + + } + + + + + + return ResultVO.success(true); + + } + }