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

设计复核

This commit is contained in:
jing's 2023-12-27 16:26:25 +08:00
parent e4e4dca10e
commit 747ab69c96
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
child.setSourceRowId(parentEntity.getSourceRowId()); child.setSourceRowId(parentEntity.getSourceRowId());
child.setBomExist(parentEntity.getBomExist()); child.setBomExist(parentEntity.getBomExist());
child.setShouldBomExist(parentEntity.getShouldBomExist()); child.setShouldBomExist(parentEntity.getShouldBomExist());
child.setStatus(parentEntity.getStatus());
if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue())) { if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue())) {
child.setStatus(OriginalStatusEnum.BORROWED_PARTS.getValue()); child.setStatus(OriginalStatusEnum.BORROWED_PARTS.getValue());
@ -783,7 +783,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
//忽略叶子节点 //忽略叶子节点
revertList.addAll(bomTreeList.stream() revertList.addAll(bomTreeList.stream()
.filter(u -> u.getBomRowId() > 0) .filter(u -> u.getBomRowId() > 0)
.map(BomNewEbomParentVO::getRowId).collect(Collectors.toList())); .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()));
} }
@ -846,20 +846,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
List<Long> updateReviewIdList = new ArrayList<>(); List<Long> updateReviewIdList = new ArrayList<>();
for (Long bomRowId : for (Long bomRowId :
rowIds) { rowIds) {
CheckEBomException checkEBomException = new CheckEBomException(bomRowId); List<BomNewEbomParentVO > childList=getBomTree(bomRowId);
System.out.println(JSON.toJSONString(checkEBomException.getAllBomDetail())); CheckEBomException checkEBomException = new CheckEBomException(childList);
checkEBomException.initException(); // System.out.println(JSON.toJSONString(checkEBomException.getAllBomDetail()));
checkEBomException.initException("projectType");
//错误状态包含在checkStatus内有异常抛出 //错误状态包含在checkStatus内有异常抛出
checkEBomException.checkContainExcept(checkStatus); checkEBomException.checkContainExcept(checkStatus);
//筛选bomRowId()>0 说明有bom，更新只到parent这层，无bom不需要更新 //筛选bomRowId()>0 说明有bom，更新只到parent这层，无bom不需要更新
//设计人员只可以复核自己的物料，如果存在引用其他用户创建的物料时，不可以改变被引用物料的审核状态。 //设计人员只可以复核自己的物料，如果存在引用其他用户创建的物料时，不可以改变被引用物料的审核状态。
updateReviewIdList.addAll(checkEBomException.getAllBomDetail().stream() updateReviewIdList.addAll(checkEBomException.getAllBomDetail().stream()
.filter(u -> u.getBomRowId() > 0 .filter(u -> u.getBomRowId() > 0
&& u.getCreatedBy().equals(dto.getUserCode())) && u.getCreatedBy().equals(SessionUtil.getUserCode()))
.map(BomNewEbomParentVO::getRowId).collect(Collectors.toList())); .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()));
updateReviewIdList.add(bomRowId);
} }
//改变复核状态 //改变复核状态
List<BomNewEbomParentEntity> updateReviewList = new ArrayList<>(); List<BomNewEbomParentEntity> updateReviewList = new ArrayList<>();
for (Long id : updateReviewIdList) { for (Long id : updateReviewIdList) {
BomNewEbomParentEntity entity = new BomNewEbomParentEntity(); BomNewEbomParentEntity entity = new BomNewEbomParentEntity();
@ -960,6 +963,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
MaterialMainEntity materialMainEntity = materialMainList.get(0); MaterialMainEntity materialMainEntity = materialMainList.get(0);
BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO(); BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
BeanUtil.copyProperties(materialMainEntity, baseMaterialVO); BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
baseMaterialVO.setCreatedBy(null);
baseMaterialVO.setExceptionStatus(materialMainEntity.getMaterialState()); baseMaterialVO.setExceptionStatus(materialMainEntity.getMaterialState());
return baseMaterialVO; return baseMaterialVO;
} }