From 55f80f8ed5ab772df08377f478f6b1219ae354fb Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 26 Dec 2023 16:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 13 +++++++++++ .../bomnew/pojo/dto/BomNewEBomChangeDTO.java | 18 +++++++++++++++ .../service/BomNewEbomParentService.java | 22 +++++++++++++++++++ .../domain/EBom/CheckEBomException.java | 7 ++++++ 4 files changed, 60 insertions(+) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomChangeDTO.java 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 a5789ecc..de30d3f8 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 @@ -268,6 +268,19 @@ public class EbomApi extends BaseApi { } + @PostMapping("changeMaterial") + @ApiOperation("更新物料行") + public ResultVO> changeMaterial(@RequestBody BomNewEBomChangeDTO dto) { + if ( dto.getParent() ==null || CollectionUtil.isEmpty(dto.getDatas()) ) { + return ResultVO.error(STATE.Error, ""); + } + + return ResultVO.success(bomNewEbomParentService.changeMaterial(dto)); + + } + + + @GetMapping("delete") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomChangeDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomChangeDTO.java new file mode 100644 index 00000000..5f40a8d4 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomChangeDTO.java @@ -0,0 +1,18 @@ +package com.nflg.product.bomnew.pojo.dto; + +import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class BomNewEBomChangeDTO { + + @ApiModelProperty("查询物料列表") + private List datas; + + @ApiModelProperty("上层") + private BomNewEbomParentVO parent; + +} 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 65d602ee..f83c70df 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 @@ -1161,4 +1161,26 @@ public class BomNewEbomParentService extends ServiceImpl changeMaterial(BomNewEBomChangeDTO dto){ + + List parentChild=dto.getDatas(); + + materialMainService.intiMaterialInfo(parentChild ); + + List checkBom=new ArrayList<>(); + checkBom.add(dto.getParent()); + checkBom.addAll(dto.getDatas()); + CheckEBomException checkEBomException=new CheckEBomException(checkBom); + checkEBomException.checkException(); + + return dto.getDatas(); + } + + + + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index 4ea81c75..c2fa0f4d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -69,6 +69,13 @@ public class CheckEBomException { } + public void initException( String ... ignorePropertyList) { + + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(allBomDetail,ignorePropertyList); + checkException(); + } + + public void checkException(){ for (BomNewEbomParentVO vo : allBomDetail) {