diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index f674bb95..65d602ee 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -8,6 +8,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; @@ -656,8 +657,8 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); } @@ -1017,8 +1018,8 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); } @@ -1058,7 +1059,9 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); + + return true; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java index 82743c8a..76b5b9b4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java @@ -91,6 +91,7 @@ public class EBomEdit { parentEntities = new ArrayList<>(); childEntities = new ArrayList<>(); + List roleList= SpringUtil.getBean(UserRoleService.class).getUserPost(); //添加数据 if (dto.getParent() == null) { @@ -123,7 +124,7 @@ public class EBomEdit { childEntities) { child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); - List roleList= SpringUtil.getBean(UserRoleService.class).getUserPost(); + //新增数据 if(child.getRowId()==null || child.getRowId().longValue()==0){ child.setRowId(IdWorker.getId()); @@ -172,6 +173,7 @@ public class EBomEdit { // Map materialVOMap = ListCommonUtil.listToMap(materialBaseInfo, BaseMaterialVO::getMaterialNo); parentEntities = new ArrayList<>(); childEntities = new ArrayList<>(); + List roleList= SpringUtil.getBean(UserRoleService.class).getUserPost(); //添加数据 if (dto.getParent() == null) { CheckEBomException eBomException=new CheckEBomException( dto.getDatas() ); @@ -214,7 +216,7 @@ public class EBomEdit { //child.setProjectTypeInputType(ProjectTypeInputTypeEnum.MANUAL_INPUT.getValue()); child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); - List roleList= SpringUtil.getBean(UserRoleService.class).getUserPost(); + //新增数据 if(child.getRowId()==null || child.getRowId().longValue()==0){ child.setRowId(IdWorker.getId());