From 86ce3b30d31d89320e1af12ce8645b5dfd93f4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 25 Sep 2024 17:01:17 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E5=88=B0SAP?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AF=BC=E5=85=A5=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/service/SapOpUtilService.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
index d3c8adcf..d03ccadc 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
@@ -16,7 +16,6 @@ import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1ResultDTO;
 import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO;
-import com.nflg.product.bomnew.util.VUtils;
 import lombok.extern.slf4j.Slf4j;
 import nflg.product.common.constant.STATE;
 import nflg.product.common.vo.ResultVO;
@@ -142,7 +141,10 @@ public class SapOpUtilService {
 
 
     public List<OperationErrorMsgVO> importToSapV2(ImportSapParamDTO impartSapParamDTO, List<T1DTO> backList) {
-        VUtils.isTure(CollUtil.isEmpty(impartSapParamDTO.getT1())).throwMessage("没有需要同步的数据");
+        if (CollUtil.isEmpty(impartSapParamDTO.getT1())) {
+            log.info("没有需要同步的数据");
+            return Collections.emptyList();
+        }
         SapReqParams params = new SapReqParams();
         // 接口名
         params.setFunName("ZRFC_PP_005");

From 22cee60742961cec7857a9535943960204c18f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 25 Sep 2024 17:07:33 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20bom=E5=8F=8D=E6=9F=A5=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=AD=90=E7=BA=A7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=8C=E2=80=9C=E5=AD=90?=
 =?UTF-8?q?=E7=BA=A7=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 @@
 
     <!--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>
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 @@
 
     <!--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
-        t_bom_new_pbom_child_formal a
+        select b.* , a.drawing_no as childDrawingNo,a.num AS childNum,a.material_unit AS childMaterialUnit
+        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

From 8dc82a054ea803bcc27ccaca090744336a36ed84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 25 Sep 2024 17:08:28 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat(pbom):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=9F=A5=E7=9C=8B=E7=9A=84=E8=B7=AF=E5=BE=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/PBomApi.java | 15 ++++++--
 .../service/BomNewPbomParentService.java      | 34 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index 89ed62e8..c00ac0ef 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -17,6 +17,7 @@ import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewTechnologyPackageTypeEntity;
+import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewPbomParentQuery;
 import com.nflg.product.bomnew.pojo.query.PbomImportToSAPQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
@@ -27,12 +28,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import nflg.product.common.vo.ResultVO;
 import org.apache.commons.compress.utils.Lists;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -40,7 +41,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -438,5 +438,14 @@ public class PBomApi extends BaseApi {
         return ResultVO.success(bomNewPbomParentService.checkBomExist(bomRowId,type));
     }
 
-
+    /**
+     * 获取节点异常状态
+     * @param query query
+     * @return 节点异常状态
+     */
+    @PostMapping("getBomException")
+    @ApiOperation("获取节点异常状态")
+    public ResultVO<List<BomExceptionVO>> getBomException(@Valid @RequestBody @NotEmpty List<BomExceptionQuery> query) {
+        return ResultVO.success(bomNewPbomParentService.getBomException(query));
+    }
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 2705b726..8eb6394a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -5,7 +5,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.*;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -24,6 +27,7 @@ import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO;
 import com.nflg.product.bomnew.pojo.entity.*;
+import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewPbomParentQuery;
 import com.nflg.product.bomnew.pojo.query.CopyPBomV2Query;
 import com.nflg.product.bomnew.pojo.query.PbomImportToSAPQuery;
@@ -43,6 +47,8 @@ import org.ttzero.excel.entity.Workbook;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -2005,4 +2011,30 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     }
 
 
+    public List<BomExceptionVO> getBomException(@Valid @NotEmpty List<BomExceptionQuery> query) {
+        List<BomExceptionVO> datas = new ArrayList<>();
+        List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(query.stream().map(BomExceptionQuery::getMaterialNo).collect(Collectors.toList()));
+        boolean isException = false;
+        for (int index = query.size() - 1; index >= 0; index--) {
+            BomExceptionQuery bom = query.get(index);
+            BomExceptionVO vo = new BomExceptionVO();
+            vo.setBomRowId(bom.getBomRowId());
+            vo.setRowId(bom.getRowId());
+            vo.setMaterialNo(bom.getMaterialNo());
+            if (isException) {
+                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_14.getValue());
+            } else {
+                BaseMaterialVO mv = materialVOS.stream().filter(f -> StrUtil.equals(f.getMaterialNo(), bom.getMaterialNo())).findFirst().orElse(null);
+                if (Objects.isNull(mv) || !Objects.equals(mv.getMaterialState(), MateiralStateEnum.ACTIVE.getValue())) {
+                    isException = true;
+                    vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
+                } else {
+                    vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
+                }
+            }
+            datas.add(vo);
+        }
+        Collections.reverse(datas);
+        return datas;
+    }
 }

From 99f49ac434b4e7be1815241084567a7394392347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 25 Sep 2024 18:31:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat(pbom):=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8D=95=E4=B8=AA=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/PBomApi.java | 12 +++++++
 .../bomnew/pojo/query/PBomExceptionQuery.java | 36 +++++++++++++++++++
 .../service/BomNewPbomParentService.java      | 34 +++++++++++++++---
 3 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index c00ac0ef..b19958ac 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -19,6 +19,7 @@ import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewTechnologyPackageTypeEntity;
 import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.BomNewPbomParentQuery;
+import com.nflg.product.bomnew.pojo.query.PBomExceptionQuery;
 import com.nflg.product.bomnew.pojo.query.PbomImportToSAPQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.*;
@@ -448,4 +449,15 @@ public class PBomApi extends BaseApi {
     public ResultVO<List<BomExceptionVO>> getBomException(@Valid @RequestBody @NotEmpty List<BomExceptionQuery> query) {
         return ResultVO.success(bomNewPbomParentService.getBomException(query));
     }
+
+    /**
+     * 获取单个节点异常状态
+     * @param query query
+     * @return 节点异常状态
+     */
+    @PostMapping("getSingleBomException")
+    @ApiOperation("获取单个节点异常状态")
+    public ResultVO<BomExceptionVO> getSingleBomException(@Valid @RequestBody @NotEmpty PBomExceptionQuery query) {
+        return ResultVO.success(bomNewPbomParentService.getSingleBomException(query));
+    }
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java
new file mode 100644
index 00000000..991432cb
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java
@@ -0,0 +1,36 @@
+package com.nflg.product.bomnew.pojo.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author 曹鹏飞
+ * @date 2024/9/25 17:38:14
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "com-nflg-product-bomnew-pojo-new-query-PBomExceptionQuery")
+public class PBomExceptionQuery implements Serializable {
+
+    /**
+     * materialNo 物料编号
+     */
+    @ApiModelProperty(value = "物料编号")
+    protected String materialNo;
+
+    /**
+     * drawingNo 图号
+     */
+    @ApiModelProperty(value = "图号")
+    protected String drawingNo;
+
+    /**
+     * facCode 工厂编号
+     */
+    @ApiModelProperty(value = "工厂编号")
+    protected String facCode;
+}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 8eb6394a..8fc5fe3c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -27,10 +27,7 @@ import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO;
 import com.nflg.product.bomnew.pojo.entity.*;
-import com.nflg.product.bomnew.pojo.query.BomExceptionQuery;
-import com.nflg.product.bomnew.pojo.query.BomNewPbomParentQuery;
-import com.nflg.product.bomnew.pojo.query.CopyPBomV2Query;
-import com.nflg.product.bomnew.pojo.query.PbomImportToSAPQuery;
+import com.nflg.product.bomnew.pojo.query.*;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.domain.PBom.*;
 import com.nflg.product.bomnew.service.domain.Sap;
@@ -2037,4 +2034,33 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         Collections.reverse(datas);
         return datas;
     }
+
+    public BomExceptionVO getSingleBomException(@Valid @NotEmpty PBomExceptionQuery query) {
+        List<String> materialNosOrDrawingNos = Collections.singletonList(StrUtil.isNotBlank(query.getMaterialNo()) ? query.getMaterialNo() : query.getDrawingNo());
+        List<BaseMaterialVO> materialVOS = materialMainService.initMaterialForAnyNo(materialNosOrDrawingNos);
+        BomExceptionVO vo = new BomExceptionVO();
+        BaseMaterialVO mVO = materialVOS.stream().findFirst().orElse(null);
+        if (Objects.nonNull(mVO)) {
+            vo.setMaterialNo(mVO.getMaterialNo());
+            if (!Objects.equals(mVO.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue())) {
+                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
+            } else {
+                materialNosOrDrawingNos = pbomChildService.lambdaQuery()
+                        .select(BomNewPbomChildEntity::getMaterialNo)
+                        .eq(StrUtil.isNotBlank(query.getMaterialNo()), BomNewPbomChildEntity::getMaterialNo, query.getMaterialNo())
+                        .eq(StrUtil.isNotBlank(query.getDrawingNo()), BomNewPbomChildEntity::getDrawingNo, query.getDrawingNo())
+                        .eq(BomNewPbomChildEntity::getFacCode, query.getFacCode())
+                        .list()
+                        .stream().map(BomNewPbomChildEntity::getMaterialNo)
+                        .collect(Collectors.toList());
+                materialVOS = materialMainService.initMaterialForAnyNo(materialNosOrDrawingNos);
+                if (materialVOS.stream().anyMatch(f -> !Objects.equals(f.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue()))) {
+                    vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
+                } else {
+                    vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
+                }
+            }
+        }
+        return vo;
+    }
 }

From 1985ad0f5b33b66fd86f7d1e311b8e429a425975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 4 Oct 2024 20:59:13 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat(pbom):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/query/PBomExceptionQuery.java |  2 +
 .../service/BomNewPbomParentService.java      | 70 +++++++++++++------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java
index 991432cb..2a39e27d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/PBomExceptionQuery.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -32,5 +33,6 @@ public class PBomExceptionQuery implements Serializable {
      * facCode 工厂编号
      */
     @ApiModelProperty(value = "工厂编号")
+    @NotEmpty(message = "工厂编号不能为空")
     protected String facCode;
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 8fc5fe3c..4589977b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -2011,22 +2011,32 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     public List<BomExceptionVO> getBomException(@Valid @NotEmpty List<BomExceptionQuery> query) {
         List<BomExceptionVO> datas = new ArrayList<>();
         List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(query.stream().map(BomExceptionQuery::getMaterialNo).collect(Collectors.toList()));
-        boolean isException = false;
-        for (int index = query.size() - 1; index >= 0; index--) {
-            BomExceptionQuery bom = query.get(index);
+        for (BomExceptionQuery bom : query) {
             BomExceptionVO vo = new BomExceptionVO();
             vo.setBomRowId(bom.getBomRowId());
             vo.setRowId(bom.getRowId());
             vo.setMaterialNo(bom.getMaterialNo());
-            if (isException) {
-                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_14.getValue());
+            vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
+            BaseMaterialVO mv = materialVOS.stream().filter(f -> StrUtil.equals(f.getMaterialNo(), bom.getMaterialNo())).findFirst().orElse(null);
+            if (Objects.isNull(mv)) {
+                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
+            } else if (!Objects.equals(mv.getMaterialState(), MateiralStateEnum.ACTIVE.getValue())) {
+                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
             } else {
-                BaseMaterialVO mv = materialVOS.stream().filter(f -> StrUtil.equals(f.getMaterialNo(), bom.getMaterialNo())).findFirst().orElse(null);
-                if (Objects.isNull(mv) || !Objects.equals(mv.getMaterialState(), MateiralStateEnum.ACTIVE.getValue())) {
-                    isException = true;
-                    vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
-                } else {
-                    vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
+                List<String> materialNos = pbomChildService.lambdaQuery()
+                        .select(BomNewPbomChildEntity::getMaterialNo)
+                        .eq(BomNewPbomChildEntity::getParentRowId, bom.getBomRowId())
+                        .list()
+                        .stream()
+                        .map(BomNewPbomChildEntity::getMaterialNo)
+                        .collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(materialNos)) {
+                    List<BaseMaterialVO> vos = materialMainService.initMaterialForAnyNo(materialNos);
+                    if (CollUtil.isNotEmpty(vos)) {
+                        if (vos.stream().anyMatch(f -> !Objects.equals(f.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue()))) {
+                            vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_14.getValue());
+                        }
+                    }
                 }
             }
             datas.add(vo);
@@ -2039,25 +2049,39 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         List<String> materialNosOrDrawingNos = Collections.singletonList(StrUtil.isNotBlank(query.getMaterialNo()) ? query.getMaterialNo() : query.getDrawingNo());
         List<BaseMaterialVO> materialVOS = materialMainService.initMaterialForAnyNo(materialNosOrDrawingNos);
         BomExceptionVO vo = new BomExceptionVO();
+        vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
         BaseMaterialVO mVO = materialVOS.stream().findFirst().orElse(null);
         if (Objects.nonNull(mVO)) {
             vo.setMaterialNo(mVO.getMaterialNo());
             if (!Objects.equals(mVO.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue())) {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
             } else {
-                materialNosOrDrawingNos = pbomChildService.lambdaQuery()
-                        .select(BomNewPbomChildEntity::getMaterialNo)
-                        .eq(StrUtil.isNotBlank(query.getMaterialNo()), BomNewPbomChildEntity::getMaterialNo, query.getMaterialNo())
-                        .eq(StrUtil.isNotBlank(query.getDrawingNo()), BomNewPbomChildEntity::getDrawingNo, query.getDrawingNo())
-                        .eq(BomNewPbomChildEntity::getFacCode, query.getFacCode())
+                BomNewPbomParentEntity p = this.lambdaQuery()
+                        .select(BomNewPbomParentEntity::getRowId)
+                        .eq(StrUtil.isNotBlank(query.getMaterialNo()), BomNewPbomParentEntity::getMaterialNo, query.getMaterialNo())
+                        .eq(StrUtil.isNotBlank(query.getDrawingNo()), BomNewPbomParentEntity::getDrawingNo, query.getDrawingNo())
+                        .lt(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue())
+                        .eq(BomNewPbomParentEntity::getFacCode, query.getFacCode())
                         .list()
-                        .stream().map(BomNewPbomChildEntity::getMaterialNo)
-                        .collect(Collectors.toList());
-                materialVOS = materialMainService.initMaterialForAnyNo(materialNosOrDrawingNos);
-                if (materialVOS.stream().anyMatch(f -> !Objects.equals(f.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue()))) {
-                    vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
-                } else {
-                    vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
+                        .stream()
+                        .findFirst()
+                        .orElse(null);
+                if (Objects.nonNull(p)) {
+                    materialNosOrDrawingNos = pbomChildService.lambdaQuery()
+                            .select(BomNewPbomChildEntity::getMaterialNo)
+                            .eq(BomNewPbomChildEntity::getParentRowId, p.getRowId())
+                            .list()
+                            .stream()
+                            .map(BomNewPbomChildEntity::getMaterialNo)
+                            .collect(Collectors.toList());
+                    if (CollUtil.isNotEmpty(materialNosOrDrawingNos)) {
+                        materialVOS = materialMainService.initMaterialForAnyNo(materialNosOrDrawingNos);
+                        if (CollUtil.isNotEmpty(materialVOS)) {
+                            if (materialVOS.stream().anyMatch(f -> !Objects.equals(f.getMaterialState(), MaterialGetEnum.MaterialStateEnum.OK.getValue()))) {
+                                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_14.getValue());
+                            }
+                        }
+                    }
                 }
             }
         }

From 87ce4de0fb1ed0c89c174ad0afc7b6a3bb4d268a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 6 Oct 2024 19:48:28 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat(pbom):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/ReverseReport/EBomQueryService.java    | 8 +++++---
 .../service/domain/ReverseReport/PBomQueryService.java    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

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 225fe560..5f7d2007 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
@@ -164,7 +164,7 @@ public class EBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1)));
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -175,15 +175,17 @@ public class EBomQueryService {
         return ebomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
             vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getChildMaterialUnit());
+            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
         }
         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 f9af58bc..d9f35a97 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
@@ -158,7 +158,7 @@ public class PBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1)));
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -169,15 +169,17 @@ public class PBomQueryService {
         return pbomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
             vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getChildMaterialUnit());
+            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
         }
         return vo;
     }

From 00dea5a0f62f24c7d9cb2b2758281b4ab87d52da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 6 Oct 2024 22:51:08 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat(pbom):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReverseReport/EBomQueryService.java       | 25 ++++++++++++++-----
 .../ReverseReport/PBomQueryService.java       | 25 ++++++++++++++-----
 .../mapper/master/BomNewEbomParentMapper.xml  |  6 ++++-
 .../mapper/master/BomNewPbomParentMapper.xml  |  6 ++++-
 4 files changed, 48 insertions(+), 14 deletions(-)

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 5f7d2007..d385a037 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
@@ -164,7 +164,17 @@ public class EBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
+                    ReverseReportVO levelVO = null;
+                    if (level > 1) {
+                        for (int i = vos.size() - 1; i >= 0; i--) {
+                            ReverseReportVO vo = vos.get(i);
+                            if (Objects.equals(level - 1, vo.getLevelNum())) {
+                                levelVO = vo;
+                                break;
+                            }
+                        }
+                    }
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO, levelVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -175,17 +185,20 @@ public class EBomQueryService {
         return ebomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO, ReverseReportVO levelVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
-            vo.setChildNum(pVO.getNum());
-            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
-            vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
+        }
+        if (Objects.nonNull(levelVO)) {
+            vo.setChildNum(levelVO.getNum());
+            vo.setChildMaterialUnit(levelVO.getMaterialUnit());
+        } else {
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         }
         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 d9f35a97..4f911cb6 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
@@ -158,7 +158,17 @@ public class PBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
+                    ReverseReportVO levelVO = null;
+                    if (level > 1) {
+                        for (int i = vos.size() - 1; i >= 0; i--) {
+                            ReverseReportVO vo = vos.get(i);
+                            if (Objects.equals(level - 1, vo.getLevelNum())) {
+                                levelVO = vo;
+                                break;
+                            }
+                        }
+                    }
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO, levelVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -169,17 +179,20 @@ public class PBomQueryService {
         return pbomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO, ReverseReportVO levelVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
-            vo.setChildNum(pVO.getNum());
-            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
-            vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
+        }
+        if (Objects.nonNull(levelVO)) {
+            vo.setChildNum(levelVO.getNum());
+            vo.setChildMaterialUnit(levelVO.getMaterialUnit());
+        } else {
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         }
         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 7ac2ead5..10ea7915 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
@@ -622,7 +622,11 @@
         </foreach>;
     </select>
     <select id="getReverseBoms" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
-        SELECT IFNULL(c.num, p.num) AS num, c.project_type projectType, c.project_type, p1.row_id parentRowId, p.*
+        SELECT IFNULL(IFNULL(c.num, p.num), 1) AS num,
+               c.project_type                     projectType,
+               c.project_type,
+               p1.row_id                          parentRowId,
+               p.*
         FROM t_bom_new_ebom_child c
                  RIGHT JOIN t_bom_new_ebom_parent p ON c.material_no = p.material_no
                  LEFT JOIN t_bom_new_ebom_parent p1 ON c.parent_row_id = p1.row_id AND p1.status = 4
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index cd4bef33..b81f4cea 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -296,7 +296,11 @@
         WHERE p.created_by = #{userCode}
     </select>
     <select id="getReverseBoms" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
-        SELECT IFNULL(c.num, p.num) AS num, c.project_type projectType, c.project_type, p1.row_id parentRowId, p.*
+        SELECT IFNULL(IFNULL(c.num, p.num), 1) AS num,
+               c.project_type                     projectType,
+               c.project_type,
+               p1.row_id                          parentRowId,
+               p.*
         FROM t_bom_new_pbom_child c
                  RIGHT JOIN t_bom_new_pbom_parent p ON c.material_no = p.material_no AND c.fac_code = p.fac_code
                  LEFT JOIN t_bom_new_pbom_parent p1