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

Merge branch 'feature/DM/nflg-bom-transition' into test

This commit is contained in:
jing's 2024-09-11 10:18:45 +08:00
parent 678379a69e defc69ab65
commit a9d059ace0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,9 @@ public class EBomEdit {
child.setEditStatus(dto.getOpType()); child.setEditStatus(dto.getOpType());
child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum()));
child.setModifyTime(LocalDateTime.now()); child.setModifyTime(LocalDateTime.now());
if (StrUtil.isNotEmpty(child.getProjectType())) {
child.setProjectType(child.getProjectType().toUpperCase().trim());
}
// if (child.getMaterialName().contains(VirtualPackageTypeEnum.MAKING_PACKAGE.getConMaterialName())) { // if (child.getMaterialName().contains(VirtualPackageTypeEnum.MAKING_PACKAGE.getConMaterialName())) {
// child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue()); // child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue());
// child.setVirtualPartIs(1); // child.setVirtualPartIs(1);
@ -202,14 +204,13 @@ public class EBomEdit {
child.setOrderNumber("001"); child.setOrderNumber("001");
} }
if (dto.getOpType() == EbomEditStatusEnum.HANDLER_FINISHED.getValue()) { if (dto.getOpType() == EbomEditStatusEnum.HANDLER_FINISHED.getValue()) {
child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); if(ObjectUtil.isNull(child.getExceptionStatus())) {
// parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
}
checkExcept(dto.getParent(), child); checkExcept(dto.getParent(), child);
} }
if (StrUtil.isNotBlank(child.getProjectType())) {
child.setProjectType(child.getProjectType().toUpperCase());
}
if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType(), true)) { if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType(), true)) {
String id = RandomUtil.randomNumbers(9); String id = RandomUtil.randomNumbers(9);
child.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id); child.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);