diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index d012bd8d..0c89c8d5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -521,29 +521,35 @@ public class BomNewPbomParentService extends ServiceImpl materials = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, drawingNo).list(); - if (CollUtil.isNotEmpty(materials)) { - return Convert.convert(BaseMaterialVO.class, materials.get(0)); - } + // if (CollUtil.isNotEmpty(materials)) { + // return Convert.convert(BaseMaterialVO.class, materials.get(0)); + // } // materialName = StrUtil.join("", result.getMaterialName(), technologyPackageTypeEntity.getRemark()); // materialDesc = StrUtil.join(" ", materialName, drawingNo); - AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); - String key = String.valueOf(IdWorker.getId()); - toM.setKey(key); - toM.setMaterialName(materialName); - toM.setDrawingNo(drawingNo); - toM.setMaterialDesc(materialDesc); - toM.setMaterialCategoryCode("201201"); - toM.setProjectType(packageParam.getProjectType()); - toM.setMaterialGetType(1); - Map mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); -// String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); - String materialNo = mMap.get(key).getMaterialNo(); - BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); - //插入工艺包 - packageParam.setTechnologyPackageMaterialNo(materialNo); - insertTechnologyPackage(packageParam); + BaseMaterialVO resultD; + if (CollUtil.isEmpty(materials)) { + AddVirtrualMaterialDTO toM = new AddVirtrualMaterialDTO(); + String key = String.valueOf(IdWorker.getId()); + toM.setKey(key); + toM.setMaterialName(materialName); + toM.setDrawingNo(drawingNo); + toM.setMaterialDesc(materialDesc); + toM.setMaterialCategoryCode("201201"); + toM.setProjectType(packageParam.getProjectType()); + toM.setMaterialGetType(1); + Map mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); + // String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); + String materialNo = mMap.get(key).getMaterialNo(); + resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); + //插入工艺包 + packageParam.setTechnologyPackageMaterialNo(materialNo); + } else { + resultD = Convert.convert(BaseMaterialVO.class, materials.get(0)); + packageParam.setTechnologyPackageMaterialNo(resultD.getMaterialNo()); + } + insertTechnologyPackage(packageParam, resultD); return resultD; }