diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java index 5fa39523..f087ad05 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java @@ -6,7 +6,6 @@ import com.mzt.logapi.context.LogRecordContext; import com.mzt.logapi.starter.annotation.LogRecord; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.conmon.util.SessionUtil; -import com.nflg.product.bomnew.mapper.master.BomNewEbomChildMapper; import com.nflg.product.bomnew.pojo.dto.EbomExcelDTO; import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity; import com.nflg.product.bomnew.pojo.query.GenerateVirtualPackageQuery; @@ -15,10 +14,6 @@ import com.nflg.product.bomnew.pojo.vo.ListForGenerateVirtualPackageVO; import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO; import com.nflg.product.bomnew.service.*; import com.nflg.product.bomnew.util.EecExcelUtil; -import com.nflg.product.bomnew.service.BomNewEbomChildService; -import com.nflg.product.bomnew.service.BomNewEbomParentService; -import com.nflg.product.bomnew.service.BomNewOriginalParentV2Service; -import com.nflg.product.bomnew.service.BomOriginalCadParentService; import com.nflg.product.bomnew.util.VUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -105,7 +100,6 @@ public class EbomV2Api extends BaseApi { LogRecordContext.putVariable("fileNme", file.getOriginalFilename()); List result = eBomImportService.importBom(file); - ebomChildService.updateEBomMaterialUse(); //这个方法有问题 // ebomParentService.compucteLevelNum(); return ResultVO.success(result); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index d1a924b8..4e91295a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -50,6 +50,9 @@ public class EBomImportService { @Resource private BomNewEbomParentService bomNewEbomParentService; + @Resource + BomNewEbomChildService ebomChildService; + @Resource private BomNewEbomChildService bomNewEbomChildService; @@ -83,6 +86,8 @@ public class EBomImportService { .collect(Collectors.toList()) ); + ebomChildService.updateEBomMaterialUse(pcs.getRight().stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toSet())); + return Collections.emptyList(); } finally { excelContextTL.remove(); @@ -378,7 +383,7 @@ public class EBomImportService { BomNewEbomParentEntity parent = new BomNewEbomParentEntity(); parent.setRowId(IdWorker.getId()); - //parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); + parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); parent.setMaterialNo(data.getParentMaterialNo()); parent.setMaterialDesc(data.getParentMaterialDesc()); BaseMaterialVO vo = materialBaseInfos.stream() @@ -458,7 +463,7 @@ public class EBomImportService { //parent.setUnitWeight(BigDecimal.ZERO); parent.setNum(BigDecimal.ONE); //parent.setTotalWeight(BomUtil.calculateTotalWeight(data.getNum(), data.getUnitWeight())); - //parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); + parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); // List cps = bomNewEbomChildService.lambdaQuery().eq(BomNewEbomChildEntity::getMaterialNo, materialNo) // .list() // .stream()