rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
曹鹏飞 2024-05-27 18:09:01 +08:00
parent 1be98febb9 13723d3442
commit 08ffa20dc3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Objects;
/** /**
* @author 曹鹏飞 * @author 曹鹏飞
@ -65,6 +66,9 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable {
private BigDecimal unitWeight; private BigDecimal unitWeight;
public BigDecimal getUnitWeight() { public BigDecimal getUnitWeight() {
if (Objects.nonNull(unitWeight)) {
return unitWeight;
}
return getMaterialWeight(); return getMaterialWeight();
} }
} }