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

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();
+    }
 }