From 8468fba46e8b80cb07787a09172eb50d508aa8ae Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 26 Dec 2023 10:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 9 ++++++--- .../product/bomnew/service/domain/EBom/EBomEdit.java | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) 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 3a6c1e9d..a05007bb 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; @@ -655,8 +656,8 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); } @@ -1016,8 +1017,8 @@ public class BomNewEbomParentService extends ServiceImpl computeLevelNumAndRootState()); } @@ -1057,7 +1058,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());