diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java index 47992feb..b54b160a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java @@ -10,6 +10,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.Objects; /** * @author 曹鹏飞 @@ -65,6 +66,9 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable { private BigDecimal unitWeight; public BigDecimal getUnitWeight() { + if (Objects.nonNull(unitWeight)) { + return unitWeight; + } return getMaterialWeight(); } }