Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -53,4 +54,17 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable {
      */
     @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）99=借用件 100=引用件")
     private Integer status = EBomStatusEnum.CHECKED.getValue();
+
+    /**
+     * 是否有BOM: 0-否 1-是
+     */
+    @ApiModelProperty(value = "是否有BOM: 0-否 1-是")
+    private Integer bomExist = 0;
+
+    @ApiModelProperty("单重1")
+    private BigDecimal unitWeight;
+
+    public BigDecimal getUnitWeight() {
+        return getMaterialWeight();
+    }
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java

@@ -2218,7 +2218,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         roots.forEach(this::buildChildren);
         //从子级开始查找
         List<BomNewEbomParentVO> boms = this.getBaseMapper().getBom(query.getMaterialNo(), query.getDrawingNo());
-        boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0));
+        boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0) || Objects.equals(c.getStatus(), EBomStatusEnum.PUBLISHED.getValue()));
         boms.forEach(this::buildChildren);
         roots.addAll(boms.stream().filter(b -> b.getRootIs() == 0 && b.getUserRootIs() == 0 && b.getRootIsForWaitReview() == 0).map(this::buildParent).flatMap(List::stream).collect(Collectors.toList()));
 

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

@@ -402,13 +402,10 @@
                 AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND
                 created_by=#{userCode}
             </if>
-            <if test="userJob==1 and query.dataType==0">
+            <if test="userJob==1">
                 AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR
                 root_is_for_wait_review=1) AND created_by=#{userCode})
             </if>
-            <if test="userJob==1 and query.dataType==1">
-                AND (root_is=1 OR user_root_is=1) AND status=4
-            </if>
             <if test="query.deviseName!=null and query.deviseName!=''">
                 AND devise_name=#{query.deviseName}
             </if>