diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index ee8261f4..47b859b9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -509,7 +509,7 @@ public class DQBomService { buildTree(root, parents, children); dQBomParentService.updateBatchById(parents); dQBomChildService.updateBatchById(children); - savePbomParents(parents); + savePbomParents(parents, root.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM : PBomStatusEnum.PUBLISH); savePbomChildren(children, parents); CompletableFuture.runAsync(() -> { @@ -549,7 +549,7 @@ public class DQBomService { bomNewPbomChildService.saveBatch(pchildren); } - private void savePbomParents(List parents) { + private void savePbomParents(List parents, PBomStatusEnum status) { List pparents = Convert.toList(BomNewPbomParentEntity.class, parents); pparents.forEach(p -> { if (Objects.equals(p.getRootIs(), 1)) { @@ -571,12 +571,13 @@ public class DQBomService { p.setCreatedTime(LocalDateTime.now()); p.setModifyTime(null); p.setEditStatus(PBomEditStatusEnum.HANDLER_FINISHED.getValue()); - p.setStatus(PBomStatusEnum.WAIT_FACTORY.getValue()); + p.setStatus(status.getValue()); p.setFacCode(FactoryCodeEnum.FACTORY_1010.getValue()); p.setSourceRowId(p.getRowId()); p.setLevelNum(parents.stream().filter(ps -> Objects.equals(ps.getRowId(), p.getRowId())).findFirst().get().getLevel()); p.setReleaseTime(LocalDateTime.now()); p.setReleaseUserName(SessionUtil.getUserName()); + p.setDeptRowId(SessionUtil.getDepartRowId()); }); bomNewPbomParentService.saveBatch(pparents); } @@ -601,7 +602,7 @@ public class DQBomService { VUtils.isTure(true).throwMessage(StrUtil.format("{}的当前版本为{},比pbom中版本{}低", parent.getMaterialNo() , parent.getCurrentVersion(), pp.getCurrentVersion())); } else { - if (pp.getStatus() >= 4) { + if (pp.getStatus() >= PBomStatusEnum.PUBLISH.getValue()) { parent.setCurrentVersion(VersionUtil.getNextVersion(pp.getCurrentVersion())); pp.setLastVersionIs(0); bomNewPbomParentService.updateById(pp);