异常检查
This commit is contained in:
parent
ce9596a61f
commit
82e0749c57
|
|
@ -1233,11 +1233,28 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
|
baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
|
||||||
baseMaterialVO.setCreatedTime(LocalDateTime.now());
|
baseMaterialVO.setCreatedTime(LocalDateTime.now());
|
||||||
baseMaterialVO.setModifyTime(LocalDateTime.now());
|
baseMaterialVO.setModifyTime(LocalDateTime.now());
|
||||||
baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
|
if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
|
||||||
|
baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
|
||||||
|
}
|
||||||
if(bomParent!=null){
|
if(bomParent!=null){
|
||||||
baseMaterialVO.setEditStatus(bomParent.getEditStatus());
|
baseMaterialVO.setEditStatus(bomParent.getEditStatus());
|
||||||
baseMaterialVO.setStatus(bomParent.getStatus());
|
baseMaterialVO.setStatus(bomParent.getStatus());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
|
||||||
|
&& (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(baseMaterialVO.getMaterialState())
|
||||||
|
|| MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(baseMaterialVO.getMaterialState()))) {
|
||||||
|
baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
|
||||||
|
}
|
||||||
|
// else if (StrUtil.isBlank(baseMaterialVO.getMaterialNo()) || Objects.isNull(baseMaterialVO.getNum()) || BigDecimal.ZERO.compareTo(baseMaterialVO.getNum()) >= 0) {
|
||||||
|
// baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
|
||||||
|
// }
|
||||||
|
|
||||||
|
else if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo()) && Objects.isNull(baseMaterialVO.getMaterialState())) {
|
||||||
|
baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
|
baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
|
||||||
return baseMaterialVO;
|
return baseMaterialVO;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue