1.清CAD数据
This commit is contained in:
parent
764747b495
commit
3e62befdeb
|
|
@ -111,8 +111,10 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
|
||||||
*/
|
*/
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public List<ImportOriginalBomVO> pullFromCadAndToEBom(String userCode) throws ExecutionException, InterruptedException {
|
public List<ImportOriginalBomVO> pullFromCadAndToEBom(String userCode) throws ExecutionException, InterruptedException {
|
||||||
|
|
||||||
List<BomOriginalCadParentEntity> parents = originalCadParentService.lambdaQuery().eq(BomOriginalCadParentEntity::getStatus, 1).eq(BomOriginalCadParentEntity::getCreatedBy, userCode).list();
|
List<BomOriginalCadParentEntity> parents = originalCadParentService.lambdaQuery().eq(BomOriginalCadParentEntity::getStatus, 1).eq(BomOriginalCadParentEntity::getCreatedBy, userCode).list();
|
||||||
|
List<ImportOriginalBomVO> toEBomResult = new ArrayList();
|
||||||
|
try {
|
||||||
|
|
||||||
VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据,你无需转换");
|
VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据,你无需转换");
|
||||||
//检查物料编码在主数据中是否存在
|
//检查物料编码在主数据中是否存在
|
||||||
List<BomOriginalCadChildEntity> childs = originalCadChildService.lambdaQuery().in(BomOriginalCadChildEntity::getParentRowId, parents.stream().map(u -> u.getRowId()).collect(Collectors.toList())).list();
|
List<BomOriginalCadChildEntity> childs = originalCadChildService.lambdaQuery().in(BomOriginalCadChildEntity::getParentRowId, parents.stream().map(u -> u.getRowId()).collect(Collectors.toList())).list();
|
||||||
|
|
@ -137,16 +139,22 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
|
||||||
originalChildService.saveOrUpdateBatch(convert.getResultChild());
|
originalChildService.saveOrUpdateBatch(convert.getResultChild());
|
||||||
}
|
}
|
||||||
//转Ebom
|
//转Ebom
|
||||||
List<ImportOriginalBomVO> toEBomResult=new ArrayList();
|
|
||||||
if (CollUtil.isNotEmpty(convert.getResultParent())) {
|
if (CollUtil.isNotEmpty(convert.getResultParent())) {
|
||||||
toEBomResult = convertToEBomV2(convert.getResultParent().stream().map(u -> u.getRowId()).collect(Collectors.toList()));
|
toEBomResult = convertToEBomV2(convert.getResultParent().stream().map(u -> u.getRowId()).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex){
|
||||||
|
VUtils.isTure(true).throwMessage("转换失败:"+ex.getMessage());
|
||||||
|
}
|
||||||
|
finally {
|
||||||
//删除cad临时表数据
|
//删除cad临时表数据
|
||||||
List<Integer> delRowIds = parents.stream().map(BomOriginalCadParentEntity::getRowId).collect(Collectors.toList());
|
List<Integer> delRowIds = parents.stream().map(BomOriginalCadParentEntity::getRowId).collect(Collectors.toList());
|
||||||
if (CollUtil.isNotEmpty(delRowIds)) {
|
if (CollUtil.isNotEmpty(delRowIds)) {
|
||||||
originalCadParentService.getBaseMapper().deleteBatchIds(delRowIds);
|
originalCadParentService.getBaseMapper().deleteBatchIds(delRowIds);
|
||||||
originalCadParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
|
originalCadParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return toEBomResult;
|
return toEBomResult;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue