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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2023-12-26 11:54:05 +08:00
parent 8591089de2 8468fba46e
commit 4f4ecc74c7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -656,8 +657,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
ebomChildService.saveOrUpdateBatch(eBomEdit.childEntities); ebomChildService.saveOrUpdateBatch(eBomEdit.childEntities);
} }
computeLevelNumAndRootState();
ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
} }
@ -1017,8 +1018,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
} }
computeLevelNumAndRootState();
ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
} }
@ -1058,7 +1059,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
deleteBomChild(dto.getDelDatas()); deleteBomChild(dto.getDelDatas());
} }
} }
computeLevelNumAndRootState(); ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
return true; return true;
} }

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

@ -91,6 +91,7 @@ public class EBomEdit {
parentEntities = new ArrayList<>(); parentEntities = new ArrayList<>();
childEntities = new ArrayList<>(); childEntities = new ArrayList<>();
List<String> roleList= SpringUtil.getBean(UserRoleService.class).getUserPost();
//添加数据 //添加数据
if (dto.getParent() == null) { if (dto.getParent() == null) {
@ -123,7 +124,7 @@ public class EBomEdit {
childEntities) { childEntities) {
child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum()));
List<String> roleList= SpringUtil.getBean(UserRoleService.class).getUserPost();
//新增数据 //新增数据
if(child.getRowId()==null || child.getRowId().longValue()==0){ if(child.getRowId()==null || child.getRowId().longValue()==0){
child.setRowId(IdWorker.getId()); child.setRowId(IdWorker.getId());
@ -172,6 +173,7 @@ public class EBomEdit {
// Map<String, BaseMaterialVO> materialVOMap = ListCommonUtil.listToMap(materialBaseInfo, BaseMaterialVO::getMaterialNo); // Map<String, BaseMaterialVO> materialVOMap = ListCommonUtil.listToMap(materialBaseInfo, BaseMaterialVO::getMaterialNo);
parentEntities = new ArrayList<>(); parentEntities = new ArrayList<>();
childEntities = new ArrayList<>(); childEntities = new ArrayList<>();
List<String> roleList= SpringUtil.getBean(UserRoleService.class).getUserPost();
//添加数据 //添加数据
if (dto.getParent() == null) { if (dto.getParent() == null) {
CheckEBomException eBomException=new CheckEBomException( dto.getDatas() ); CheckEBomException eBomException=new CheckEBomException( dto.getDatas() );
@ -214,7 +216,7 @@ public class EBomEdit {
//child.setProjectTypeInputType(ProjectTypeInputTypeEnum.MANUAL_INPUT.getValue()); //child.setProjectTypeInputType(ProjectTypeInputTypeEnum.MANUAL_INPUT.getValue());
child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum())); child.setTotalWeight(NumberUtil.mul(child.getUnitWeight(), child.getNum()));
List<String> roleList= SpringUtil.getBean(UserRoleService.class).getUserPost();
//新增数据 //新增数据
if(child.getRowId()==null || child.getRowId().longValue()==0){ if(child.getRowId()==null || child.getRowId().longValue()==0){
child.setRowId(IdWorker.getId()); child.setRowId(IdWorker.getId());