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

BOM删除提示修改

This commit is contained in:
10002327 2024-10-23 17:54:45 +08:00
parent a4966b897a
commit 99d45f5c17
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1499,10 +1499,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
//检查物料是否冻结中，冻结中无法删除 //检查物料是否冻结中，冻结中无法删除
List<MaterialMainEntity> mList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery() List<MaterialMainEntity> mList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery()
.eq(MaterialMainEntity::getMaterialNo,parent.getMaterialNo()) .eq(MaterialMainEntity::getMaterialNo,parent.getMaterialNo())
.eq(MaterialMainEntity::getMaterialState, MaterialGetEnum.MaterialStateEnum.STATE_NO_4.getValue())); .in(MaterialMainEntity::getMaterialState, com.google.common.collect.Lists.newArrayList(MaterialGetEnum.MaterialStateEnum.STATE_NO_4.getValue(),MaterialGetEnum.MaterialStateEnum.STATE_NO_5.getValue())));
if(CollUtil.isNotEmpty(mList)){ if(CollUtil.isNotEmpty(mList)){
VUtils.isTure(true).throwMessage(StrUtil.join(",", Optional.ofNullable(mList).map(l->l.get(0)) VUtils.isTure(true).throwMessage(StrUtil.join(",", Optional.ofNullable(mList).map(l->l.get(0))
.map(MaterialMainEntity::getMaterialNo).orElse(String.valueOf(bomRowId)), "冻结中无法删除~")); .map(MaterialMainEntity::getMaterialNo).orElse(String.valueOf(bomRowId)), "冻结编码无法编辑删除BOM~"));
} }
//检查是否存在发布前的版本，有则不能发起 BOM删除 //检查是否存在发布前的版本，有则不能发起 BOM删除
@ -1640,6 +1640,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
newChild.setIdentityNo(bomRowId + "_" + newChild.getRowId()); newChild.setIdentityNo(bomRowId + "_" + newChild.getRowId());
newChild.setOrderNumber("001"); newChild.setOrderNumber("001");
newChild.setProjectType(ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_K.getValue()); newChild.setProjectType(ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_K.getValue());
newChild.setMaterialDesc("[BOM已删除]");
newChild.setProjectTypeInputType(0); newChild.setProjectTypeInputType(0);
newChild.setCreatedBy(SessionUtil.getUserCode()); newChild.setCreatedBy(SessionUtil.getUserCode());
newChild.setVirtualPartIs(1); newChild.setVirtualPartIs(1);

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

@ -1450,10 +1450,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
//检查物料是否冻结中，冻结中无法删除 //检查物料是否冻结中，冻结中无法删除
List<MaterialMainEntity> mList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery() List<MaterialMainEntity> mList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery()
.eq(MaterialMainEntity::getMaterialNo,parent.getMaterialNo()) .eq(MaterialMainEntity::getMaterialNo,parent.getMaterialNo())
.eq(MaterialMainEntity::getMaterialState, MaterialGetEnum.MaterialStateEnum.STATE_NO_4.getValue())); .in(MaterialMainEntity::getMaterialState, com.google.common.collect.Lists.newArrayList(MaterialGetEnum.MaterialStateEnum.STATE_NO_4.getValue(),MaterialGetEnum.MaterialStateEnum.STATE_NO_5.getValue())));
if(CollUtil.isNotEmpty(mList)){ if(CollUtil.isNotEmpty(mList)){
VUtils.isTure(true).throwMessage(StrUtil.join(",", Optional.ofNullable(mList).map(l->l.get(0)) VUtils.isTure(true).throwMessage(StrUtil.join(",", Optional.ofNullable(mList).map(l->l.get(0))
.map(MaterialMainEntity::getMaterialNo).orElse(String.valueOf(bomRowId)), "冻结中无法删除~")); .map(MaterialMainEntity::getMaterialNo).orElse(String.valueOf(bomRowId)), "冻结编码无法编辑删除BOM~"));
} }
VUtils.isTure(parent.getStatus() < PBomStatusEnum.PUBLISH.getValue()).throwMessage("只有已发布的BOM，才能删除"); VUtils.isTure(parent.getStatus() < PBomStatusEnum.PUBLISH.getValue()).throwMessage("只有已发布的BOM，才能删除");
//检查当前用户是否有该工厂权限 //检查当前用户是否有该工厂权限