From 1011bda85733a66a6ebb9b5674d459f945095f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 3 Jun 2024 15:34:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E6=90=9C=E7=B4=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewEbomParentService.java | 8 ++++++-- .../mapper/master/BomNewEbomParentMapper.xml | 14 ++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) 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 18aee016..de919938 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 @@ -2223,13 +2223,17 @@ public class BomNewEbomParentService extends ServiceImpl result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() - , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); + Page result; if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) { + result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() + , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); //列表搜索 materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); return result; } + query.setShowMySelfOnly(0); + result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() + , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); //根据编号或图号搜索 //从顶级开始查找 List roots = result.getRecords().stream() diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 68c9bc56..ebebadac 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -457,12 +457,14 @@ , b.* FROM t_bom_new_ebom_child b LEFT JOIN t_bom_new_ebom_parent a ON a.material_no = b.material_no - - WHERE b.material_no = #{materialNo} - - - WHERE b.drawingNo = #{drawingNo} - + + + AND b.material_no = #{materialNo} + + + AND b.drawing_no = #{drawingNo} + + ORDER BY b.order_number From 827f9fd4c2e9f5013f61536221bdf3f9782460d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 3 Jun 2024 15:42:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E5=90=88=E5=B9=B6=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/constant/EBomConstant.java | 2 ++ .../domain/OriginalBom/OriginalBomToEBomV2Convert.java | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java index 7f4bd581..7bfb0323 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java @@ -31,6 +31,8 @@ public class EBomConstant { public static final String PROJECT_TYPE_T="T"; + public static final String KG="KG"; + @AllArgsConstructor @Getter diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 1bb0148c..abcc3c6b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -28,6 +28,7 @@ import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VersionUtil; import lombok.Getter; +import org.aspectj.weaver.ast.ITestVisitor; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -116,7 +117,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { BigDecimal totalWeightResult = BigDecimal.ZERO; List rowIds=new ArrayList<>(); for (BomOriginalListVO item : list1) { - numResult = NumberUtil.add(numResult, Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO); + BigDecimal numNew=BigDecimal.ZERO; + if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){ + numNew= item.getTotalWeight(); + }else { + numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum()); + } +// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO); + numResult = NumberUtil.add(numResult, numNew); totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight()); rowIds.add(item.getRowId()); } From a7c53b06b5c1621aee767623d3f87c1c089b2c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 3 Jun 2024 16:30:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(ebom):=20=E7=BC=96=E8=BE=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 7 ++++--- .../bomnew/pojo/vo/BomNewEbomEditDetailVO.java | 18 ++++++++++++++---- .../service/BomNewEbomParentService.java | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) 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 48b4638d..97ec92a9 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 @@ -38,7 +38,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -297,7 +296,9 @@ public class EbomApi extends BaseApi { @GetMapping("editDetail") @ApiOperation("编辑物料列表") public ResultVO editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId - , @RequestParam("projectType") String projectType, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) { + , @RequestParam("projectType") String projectType + , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage + , @RequestParam("parentBomRowId") Long parentBomRowId) { if (Objects.isNull(rowId)) { VUtils.isTure(true).throwMessage("rowId 不能为空"); } @@ -305,7 +306,7 @@ public class EbomApi extends BaseApi { VUtils.isTure(true).throwMessage("bomRowId不能为空"); } - return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage)); + return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage, parentBomRowId)); } @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 7021067a..ea9894dd 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 @@ -6,19 +6,29 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Collections; import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "com-nflg-product-bomnew-pojo-new-vo-BomNewEbomEditDetailVO") -public class BomNewEbomEditDetailVO implements Serializable { +public class BomNewEbomEditDetailVO implements Serializable { + /* + * 当前节点 + */ + @ApiModelProperty("当前节点") private BomNewEbomParentVO parent; + /* + * 当前节点的子级 + */ + @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 de919938..42901635 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 @@ -1586,7 +1586,7 @@ public class BomNewEbomParentService extends ServiceImpl