From 999e071e4bdf75787ca88be01b0fb92e835c9580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 29 Jun 2024 14:32:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8D=E5=BD=93?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8C=85=E7=89=A9=E6=96=99=E5=9C=A8=E4=B8=BB?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B7=A5=E8=89=BA=E5=8C=85=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=A6=82=E9=A2=84=E6=9C=9F=E5=88=9B=E5=BB=BA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewPbomParentService.java | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) 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; }