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

fix(pbom): 修复当工艺包物料在主物料已存在时，创建工艺包没有如预期创建节点的问题

This commit is contained in:
曹鹏飞 2024-06-29 14:32:18 +08:00
parent 4217fa8b83
commit 999e071e4b
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,29 +521,35 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
// 检查改图号是否已存在主数据中 // 检查改图号是否已存在主数据中
List<MaterialMainEntity> materials = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, drawingNo).list(); List<MaterialMainEntity> materials = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, drawingNo).list();
if (CollUtil.isNotEmpty(materials)) { // if (CollUtil.isNotEmpty(materials)) {
return Convert.convert(BaseMaterialVO.class, materials.get(0)); // return Convert.convert(BaseMaterialVO.class, materials.get(0));
} // }
// materialName = StrUtil.join("", result.getMaterialName(), technologyPackageTypeEntity.getRemark()); // materialName = StrUtil.join("", result.getMaterialName(), technologyPackageTypeEntity.getRemark());
// materialDesc = StrUtil.join(" ", materialName, drawingNo); // materialDesc = StrUtil.join(" ", materialName, drawingNo);
AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); BaseMaterialVO resultD;
String key = String.valueOf(IdWorker.getId()); if (CollUtil.isEmpty(materials)) {
toM.setKey(key); AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO();
toM.setMaterialName(materialName); String key = String.valueOf(IdWorker.getId());
toM.setDrawingNo(drawingNo); toM.setKey(key);
toM.setMaterialDesc(materialDesc); toM.setMaterialName(materialName);
toM.setMaterialCategoryCode("201201"); toM.setDrawingNo(drawingNo);
toM.setProjectType(packageParam.getProjectType()); toM.setMaterialDesc(materialDesc);
toM.setMaterialGetType(1); toM.setMaterialCategoryCode("201201");
Map<String, AddVirtrualMaterialDTO> mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); toM.setProjectType(packageParam.getProjectType());
// String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); toM.setMaterialGetType(1);
String materialNo = mMap.get(key).getMaterialNo(); Map<String, AddVirtrualMaterialDTO> mMap = materialService.batchAddMaterial(ImmutableList.of(toM));
BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); // String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201");
//插入工艺包 String materialNo = mMap.get(key).getMaterialNo();
packageParam.setTechnologyPackageMaterialNo(materialNo); resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0);
insertTechnologyPackage(packageParam); //插入工艺包
packageParam.setTechnologyPackageMaterialNo(materialNo);
} else {
resultD = Convert.convert(BaseMaterialVO.class, materials.get(0));
packageParam.setTechnologyPackageMaterialNo(resultD.getMaterialNo());
}
insertTechnologyPackage(packageParam, resultD);
return resultD; return resultD;
} }