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

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

This commit is contained in:
曹鹏飞 2024-06-24 14:35:05 +08:00
parent bfc126fe80 795ff6f6ab
commit 1674c43ae2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1786,10 +1786,19 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
if (StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
}else{
baseMaterialVO.setUnitWeight(null);
}
if (ObjectUtil.isNull(baseMaterialVO.getNum())) {
baseMaterialVO.setNum(new BigDecimal(1));
}
baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
//materialUnit KG 单重=数量=总重
if(baseMaterialVO.getMaterialUnit().toUpperCase().equals("KG")){
baseMaterialVO.setNum(baseMaterialVO.getUnitWeight());
baseMaterialVO.setTotalWeight(baseMaterialVO.getUnitWeight());
}
if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
@ -1802,7 +1811,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
}
baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
return baseMaterialVO;
}
throw new NflgBusinessException(STATE.Error, "未查询到相关物料信息");