xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.2.3

Browse Source 
结构bom在修改和删除时判断生产bom是否引用
master
xs 1 month ago
parent 3e2eca569a
commit 3ad2ca23c8
1 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File

121
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseStructureBomServiceImpl.java
Unescape Escape View File

@ -18,9 +18,11 @@ import org.dromara.common.core.utils.TreeBuildUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.mes.domain.BaseClassTeamInfo;
import org.dromara.mes.domain.ProdMaterialBom;
import org.dromara.mes.domain.bo.BaseClassTeamInfoBo;
import org.dromara.mes.domain.vo.BaseClassTeamInfoVo;
import org.dromara.mes.domain.vo.TreeSelect;
import org.dromara.mes.mapper.ProdMaterialBomMapper;
import org.springframework.stereotype.Service;
import org.dromara.mes.domain.bo.BaseStructureBomBo;
import org.dromara.mes.domain.vo.BaseStructureBomVo;
@ -43,6 +45,8 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
private final BaseStructureBomMapper baseMapper;
private final ProdMaterialBomMapper prodMaterialBomMapper;
/**
* 查询结构BOM信息
*
@ -50,7 +54,7 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
* @return 结构BOM信息
*/
@Override
public BaseStructureBomVo queryById(Long structureBomId){
public BaseStructureBomVo queryById(Long structureBomId) {
return baseMapper.selectVoById(structureBomId);
}
@ -79,7 +83,7 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/* LambdaQueryWrapper<BaseClassTeamInfo> lqw = buildQueryWrapper(bo);
Page<BaseClassTeamInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);*/
MPJLambdaWrapper<BaseStructureBom> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<BaseStructureBom> lqw = buildQueryWrapper(bo);
Page<BaseStructureBomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@ -88,18 +92,18 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
private MPJLambdaWrapper<BaseStructureBom> buildQueryWrapper(BaseStructureBomBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseStructureBom> lqw = JoinWrappers.lambda(BaseStructureBom.class)
.selectAll(BaseStructureBom.class)
.eq(bo.getStructureBomId() != null, BaseStructureBom::getStructureBomId, bo.getStructureBomId())
.eq(bo.getParentId() != null, BaseStructureBom::getParentId, bo.getParentId())
.eq(bo.getMaterialTypeId()!=null, BaseStructureBom::getMaterialTypeId, bo.getMaterialTypeId())
.like(StringUtils.isNotBlank(bo.getMaterialTypeName()), BaseStructureBom::getMaterialTypeName, bo.getMaterialTypeName())
.eq(StringUtils.isNotBlank(bo.getStructureBomDesc()), BaseStructureBom::getStructureBomDesc, bo.getStructureBomDesc())
.eq(StringUtils.isNotBlank(bo.getStructureBomVersion()), BaseStructureBom::getStructureBomVersion, bo.getStructureBomVersion())
.eq(StringUtils.isNotBlank(bo.getAncestors()), BaseStructureBom::getAncestors, bo.getAncestors())
.eq(bo.getLevel() != null, BaseStructureBom::getLevel, bo.getLevel())
.eq(bo.getTopFlag() != null, BaseStructureBom::getTopFlag, bo.getTopFlag())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseStructureBom::getActiveFlag, bo.getActiveFlag())
.orderByDesc(BaseStructureBom::getCreateTime);
.selectAll(BaseStructureBom.class)
.eq(bo.getStructureBomId() != null, BaseStructureBom::getStructureBomId, bo.getStructureBomId())
.eq(bo.getParentId() != null, BaseStructureBom::getParentId, bo.getParentId())
.eq(bo.getMaterialTypeId() != null, BaseStructureBom::getMaterialTypeId, bo.getMaterialTypeId())
.like(StringUtils.isNotBlank(bo.getMaterialTypeName()), BaseStructureBom::getMaterialTypeName, bo.getMaterialTypeName())
.eq(StringUtils.isNotBlank(bo.getStructureBomDesc()), BaseStructureBom::getStructureBomDesc, bo.getStructureBomDesc())
.eq(StringUtils.isNotBlank(bo.getStructureBomVersion()), BaseStructureBom::getStructureBomVersion, bo.getStructureBomVersion())
.eq(StringUtils.isNotBlank(bo.getAncestors()), BaseStructureBom::getAncestors, bo.getAncestors())
.eq(bo.getLevel() != null, BaseStructureBom::getLevel, bo.getLevel())
.eq(bo.getTopFlag() != null, BaseStructureBom::getTopFlag, bo.getTopFlag())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseStructureBom::getActiveFlag, bo.getActiveFlag())
.orderByDesc(BaseStructureBom::getCreateTime);
return lqw;
}
@ -147,10 +151,23 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BaseStructureBom entity){
if(entity.getMaterialTypeId().equals(entity.getParentId())){
private void validEntityBeforeSave(BaseStructureBom entity) {
if (entity.getMaterialTypeId().equals(entity.getParentId())) {
throw new ServiceException("物料类型不能与子级物料类型相同");
}
if (entity.getStructureBomId() != null) {
BaseStructureBomVo dbStructureBomVo = baseMapper.selectVoById(entity.getStructureBomId());
Long dbParentMaterialTypeId = dbStructureBomVo.getParentId();
Long dbMaterialTypeId = dbStructureBomVo.getMaterialTypeId();
if (dbParentMaterialTypeId.equals(entity.getParentId()) &&
dbMaterialTypeId.equals(entity.getMaterialTypeId())) {
throw new ServiceException("没有修改，无需保存");
}
if (materialBomUsed(dbStructureBomVo)) {
throw new ServiceException("物料类型和子级物料类型都已经在生产BOM中配置，不允许修改");
}
}
BaseStructureBom query = new BaseStructureBom();//同一个物料类型同一个父级，别重复添加
query.setParentId(entity.getParentId());
query.setMaterialTypeId(entity.getMaterialTypeId());
@ -167,6 +184,25 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
}
/**
* 校验是否被生产bom引用，需要校验父级和子级都已经被引用，才算引用
*/
private boolean materialBomUsed(BaseStructureBomVo dbStructureBomVo){
//需要校验父级和子级都已经被引用，才算引用
Long dbParentMaterialTypeId = dbStructureBomVo.getParentId();
Long dbMaterialTypeId = dbStructureBomVo.getMaterialTypeId();
ProdMaterialBom parentQuery = new ProdMaterialBom();
parentQuery.setMaterialTypeId(dbParentMaterialTypeId);
Long parentCount = prodMaterialBomMapper.selectCount(Wrappers.lambdaQuery(parentQuery));
ProdMaterialBom childQuery = new ProdMaterialBom();
childQuery.setMaterialTypeId(dbMaterialTypeId);
Long childCount = prodMaterialBomMapper.selectCount(Wrappers.lambdaQuery(childQuery));
return (parentCount > 0 && childCount > 0) ;
}
/**
* 校验并批量删除结构BOM信息信息
*
@ -176,24 +212,25 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
if (isValid) {
for (Long id : ids) {
//监测删除的节点是否有子节点
BaseStructureBom query = new BaseStructureBom();
query.setParentId(id);
if (baseMapper.selectCount(Wrappers.lambdaQuery(query)) > 0) {
throw new ServiceException("存在子节点,不允许删除");
throw new ServiceException("BOM结构编号["+id+"]存在子节点,不允许删除");
}
BaseStructureBomVo dbStructureBomVo = baseMapper.selectVoById(id);
if (materialBomUsed(dbStructureBomVo)) {
throw new ServiceException("BOM结构编号["+id+"]的物料类型和子级物料类型都已经在生产BOM中配置，不允许删除");
}
}
}
return baseMapper.deleteByIds(ids) > 0;
}
/**
* 查询bom结构树结构信息
*
@ -215,24 +252,20 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
* @param structureBomVos 部门列表
* @return 树结构列表
*/
private List<BaseStructureBomVo> buildStructureBomTree(List<BaseStructureBomVo> structureBomVos)
{
private List<BaseStructureBomVo> buildStructureBomTree(List<BaseStructureBomVo> structureBomVos) {
List<BaseStructureBomVo> returnList = new ArrayList<BaseStructureBomVo>();
List<Long> tempList = structureBomVos.stream().map(BaseStructureBomVo::getMaterialTypeId).collect(Collectors.toList());
for (BaseStructureBomVo structureBomVo : structureBomVos)
{
if(structureBomVo.getMaterialTypeId().equals(-1L) && StringUtil.isBlank(structureBomVo.getMaterialTypeName())){
for (BaseStructureBomVo structureBomVo : structureBomVos) {
if (structureBomVo.getMaterialTypeId().equals(-1L) && StringUtil.isBlank(structureBomVo.getMaterialTypeName())) {
structureBomVo.setMaterialTypeName("BOM结构");
}
// 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(structureBomVo.getParentId()))
{
if (!tempList.contains(structureBomVo.getParentId())) {
recursionFn(structureBomVos, structureBomVo);
returnList.add(structureBomVo);
}
}
if (returnList.isEmpty())
{
if (returnList.isEmpty()) {
returnList = structureBomVos;
}
return returnList;
@ -244,8 +277,7 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
* @param baseStructureBomVos 生产bom结构树列表
* @return 下拉树结构列表
*/
private List<TreeSelect> buildStructureBomTreeSelect(List<BaseStructureBomVo> baseStructureBomVos)
{
private List<TreeSelect> buildStructureBomTreeSelect(List<BaseStructureBomVo> baseStructureBomVos) {
List<BaseStructureBomVo> structureBomTrees = buildStructureBomTree(baseStructureBomVos);
return structureBomTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
}
@ -254,15 +286,12 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/**
* 递归列表
*/
private void recursionFn(List<BaseStructureBomVo> list, BaseStructureBomVo t)
{
private void recursionFn(List<BaseStructureBomVo> list, BaseStructureBomVo t) {
// 得到子节点列表
List<BaseStructureBomVo> childList = getChildList(list, t);
t.setChildren(childList);
for (BaseStructureBomVo tChild : childList)
{
if (hasChild(list, tChild))
{
for (BaseStructureBomVo tChild : childList) {
if (hasChild(list, tChild)) {
recursionFn(list, tChild);
}
}
@ -271,15 +300,12 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/**
* 得到子节点列表
*/
private List<BaseStructureBomVo> getChildList(List<BaseStructureBomVo> list, BaseStructureBomVo t)
{
private List<BaseStructureBomVo> getChildList(List<BaseStructureBomVo> list, BaseStructureBomVo t) {
List<BaseStructureBomVo> tlist = new ArrayList<BaseStructureBomVo>();
Iterator<BaseStructureBomVo> it = list.iterator();
while (it.hasNext())
{
while (it.hasNext()) {
BaseStructureBomVo n = (BaseStructureBomVo) it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getMaterialTypeId().longValue())
{
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getMaterialTypeId().longValue()) {
tlist.add(n);
}
}
@ -289,8 +315,7 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/**
* 判断是否有子节点
*/
private boolean hasChild(List<BaseStructureBomVo> list, BaseStructureBomVo t)
{
private boolean hasChild(List<BaseStructureBomVo> list, BaseStructureBomVo t) {
return getChildList(list, t).size() > 0 ? true : false;
}
@ -300,7 +325,7 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService {
/* *//**
/* *//**
* 构建前端所需要下拉树结构（此方法有bug，只能按parentid排序才能组成一颗树）
*
* @param structureBomVos 物料结构bom列表

Write Preview
Loading…
Cancel
Save