From 22cee60742961cec7857a9535943960204c18f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 25 Sep 2024 17:07:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bom=E5=8F=8D=E6=9F=A5=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=AD=90=E7=BA=A7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=8C=E2=80=9C=E5=AD=90=E7=BA=A7?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8D=95=E4=BD=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java | 6 ++++++ .../service/domain/ReverseReport/EBomQueryService.java | 2 ++ .../service/domain/ReverseReport/PBomQueryService.java | 2 ++ .../resources/mapper/master/BomNewEbomParentMapper.xml | 7 ++++--- .../mapper/master/BomNewPbomParentFormalMapper.xml | 4 ++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java index 7a4128d7..55dad491 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java @@ -42,9 +42,15 @@ public class ReverseReportVO { @ApiModelProperty(value = "数量") private BigDecimal num; + @ApiModelProperty(value = "子级数量") + private BigDecimal childNum; + @ApiModelProperty("单位") private String materialUnit; + @ApiModelProperty("子级单位") + private String childMaterialUnit; + @ApiModelProperty(value = "创建人编码") private String createdBy; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java index 9f2e0398..225fe560 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java @@ -182,6 +182,8 @@ public class EBomQueryService { vo.setBomVersion("1"); } else { vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); + vo.setChildNum(lastVO.getNum()); + vo.setChildMaterialUnit(lastVO.getChildMaterialUnit()); } return vo; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java index 524bc659..f9af58bc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java @@ -176,6 +176,8 @@ public class PBomQueryService { vo.setBomVersion("1"); } else { vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); + vo.setChildNum(lastVO.getNum()); + vo.setChildMaterialUnit(lastVO.getChildMaterialUnit()); } return vo; } 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 912374db..7ac2ead5 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 @@ -412,9 +412,9 @@ - select b.* , a.drawing_no as childDrawingNo from t_bom_new_ebom_child a + select b.*, a.drawing_no as childDrawingNo, a.num AS childNum, a.material_unit AS childMaterialUnit + from t_bom_new_ebom_child a join t_bom_new_ebom_parent b on a.parent_row_id=b.row_id where a.material_no =#{materialNo} and b.status=4 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentFormalMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentFormalMapper.xml index 04313924..a0db0095 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentFormalMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentFormalMapper.xml @@ -78,8 +78,8 @@