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-05-17 17:29:48 +08:00
parent 004309c5c3 e9ed71800c
commit b40728514f
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
View File

@ -209,12 +209,25 @@ public class EBomEdit {
if(StrUtil.isEmpty(child.getOrderNumber())){ if(StrUtil.isEmpty(child.getOrderNumber())){
child.setOrderNumber("00"); child.setOrderNumber("00");
} }
if (dto.getOpType() == 2) {
child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
// parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); // parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
checkExcept(dto.getParent(), child); checkExcept(dto.getParent(), child);
}
if (StrUtil.isNotBlank(child.getProjectType())) { if (StrUtil.isNotBlank(child.getProjectType())) {
child.setProjectType(child.getProjectType().toUpperCase()); child.setProjectType(child.getProjectType().toUpperCase());
} }
if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType(), true)) {
if (StrUtil.isBlank(child.getMaterialUnit())) {
child.setMaterialUnit("PC");
}
if (StrUtil.isBlank(child.getMaterialOriginalUnit())) {
child.setMaterialOriginalUnit("PC");
}
if (Objects.isNull(child.getNum())) {
child.setNum(BigDecimal.ONE);
}
}
} }
@ -224,7 +237,11 @@ public class EBomEdit {
private void checkExcept(BomNewEbomParentVO parent, BomNewEbomChildEntity child) { private void checkExcept(BomNewEbomParentVO parent, BomNewEbomChildEntity child) {
if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType(), true)) {
if (StrUtil.isBlank(child.getMaterialDesc())) {
child.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
}
} else {
if (StrUtil.isBlank(child.getMaterialNo()) || Objects.isNull(child.getNum()) if (StrUtil.isBlank(child.getMaterialNo()) || Objects.isNull(child.getNum())
|| BigDecimal.ZERO.compareTo(child.getNum()) >= 0) { || BigDecimal.ZERO.compareTo(child.getNum()) >= 0) {
child.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue()); child.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
@ -239,7 +256,7 @@ public class EBomEdit {
child.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue()); child.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue());
} }
} }
}
} }