From d4788a1d4af9c5f3404bef0698eb10577730ad77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 14 Jun 2024 08:10:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E8=B0=83=E6=95=B4=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/EBomImportService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 8906aa8d..6c4fc889 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 @@ -56,6 +56,7 @@ public class EBomImportService { @Resource private BomNewEbomChildService bomNewEbomChildService; + @Transactional(rollbackFor = Exception.class) public List importBom(MultipartFile file) throws IOException { try { rowNum.set(1); @@ -89,13 +90,15 @@ public class EBomImportService { ebomChildService.updateEBomMaterialUse(pcs.getRight().stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toSet())); return Collections.emptyList(); + } catch (Exception ex) { + log.error("导入ebom异常", ex); + throw ex; } finally { excelContextTL.remove(); } } - @Transactional(rollbackFor = Exception.class) - public void save(List parents, List children) { + private void save(List parents, List children) { Set pMaterialNos = parents.stream().map(BomNewEbomParentEntity::getMaterialNo).collect(Collectors.toSet()); List oldParents = bomNewEbomParentService.getLatestByMaterialNo(pMaterialNos); oldParents.forEach(p -> {