1、转PBOM不显示问题
This commit is contained in:
parent
e90c7c2818
commit
29d9bcb6fc
|
|
@ -859,15 +859,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//检查该版本是否已转换过该工厂的Pbom
|
//检查该版本是否已转换过该工厂的Pbom
|
||||||
// for (BomNewEbomParentEntity parent : parents){
|
for (BomNewEbomParentEntity parent : parents){
|
||||||
// List<BomNewPbomParentEntity> list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion())
|
List<BomNewPbomParentEntity> list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion())
|
||||||
// .select(BomNewPbomParentEntity::getFacCode).list();
|
.select(BomNewPbomParentEntity::getFacCode).list();
|
||||||
// if(CollUtil.isNotEmpty(list)){
|
if(CollUtil.isNotEmpty(list)){
|
||||||
// Set<String> dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet());
|
Set<String> dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet());
|
||||||
// Set<String> checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes()));
|
Set<String> checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes()));
|
||||||
// VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料:"+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂");
|
VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料:"+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂");
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
for (Long bomRowId : paramDto.getBomRowIds()) {
|
for (Long bomRowId : paramDto.getBomRowIds()) {
|
||||||
BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, this.getById(bomRowId));
|
BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, this.getById(bomRowId));
|
||||||
|
|
|
||||||
|
|
@ -289,9 +289,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
|
||||||
child.setDeviseUserCode(parentEntity.getDeviseUserCode());
|
child.setDeviseUserCode(parentEntity.getDeviseUserCode());
|
||||||
|
|
||||||
child.setCreatedTime(parentEntity.getCreatedTime());
|
child.setCreatedTime(parentEntity.getCreatedTime());
|
||||||
if (parentEntity.getBomExist() == 1) {
|
// if (parentEntity.getBomExist() == 1) {
|
||||||
child.setBomRowId(parentEntity.getRowId());
|
child.setBomRowId(parentEntity.getRowId());
|
||||||
}
|
// }
|
||||||
child.setLevelNum(parentEntity.getLevelNum());
|
child.setLevelNum(parentEntity.getLevelNum());
|
||||||
child.setDeptName(parentEntity.getDeptName());
|
child.setDeptName(parentEntity.getDeptName());
|
||||||
child.setChangeDesc(parentEntity.getChangeDesc());
|
child.setChangeDesc(parentEntity.getChangeDesc());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue