feat: bom反查结果添加“子级物料数量”，“子级物料单位”

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;
 

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;
     }

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;
     }

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml

@@ -412,9 +412,9 @@
 
     <!--ebom单层反查-->
     <select id="eBomReverseReport" resultType="com.nflg.product.bomnew.pojo.vo.ReverseReportVO">
-        select b.* , a.drawing_no as childDrawingNo from t_bom_new_ebom_child_formal a
+        select b.* , a.drawing_no as childDrawingNo,a.num AS childNum,a.material_unit AS childMaterialUnit
+        from t_bom_new_ebom_child_formal a
         join t_bom_new_ebom_parent_formal b on a.parent_row_id=b.row_id
-
         where true
         <if test="bomVersionRowId!=null and bomVersionRowId>0">
             and a.bom_version_row_id=#{bomVersionRowId}
@@ -427,7 +427,8 @@
 
     <!--ebom单层反查-->
     <select id="eBomReverseReportNewst" resultType="com.nflg.product.bomnew.pojo.vo.ReverseReportVO">
-        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
     </select>

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentFormalMapper.xml

@@ -78,8 +78,8 @@
 
     <!--pbom单层反查-->
     <select id="pBomSingleReverseReport" resultType="com.nflg.product.bomnew.pojo.vo.ReverseReportVO">
-        select IFNULL(a.num,1)*IFNULL(b.num,1) AS num,b.* , a.drawing_no as childDrawingNo from
+        select b.* , a.drawing_no as childDrawingNo,a.num AS childNum,a.material_unit AS childMaterialUnit
-        t_bom_new_pbom_child_formal a
+        from t_bom_new_pbom_child_formal a
         join t_bom_new_pbom_parent_formal b on a.parent_row_id=b.row_id
 
         where true