From 2813a655e9166ebb77aa4e61bb3ff1170c3feeb8 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 29 Dec 2023 20:12:11 +0800 Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=85=A5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index ec170931..00514848 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -615,18 +615,19 @@ public class BomNewEbomParentService extends ServiceImpl result = EecExcelUtil.getExcelContext(inputStream, BomNewEBomImportExcelDTO.class); + if(CollectionUtil.isEmpty(result)){ + + } + + + List materialNos = result.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); + + CheckEBomException.checkMaterialNoInMain1(materialNos)); + EBomImportExcelCheck eBomImportExcelCheck=new EBomImportExcelCheck(); + eBomImportExcelCheck.validData(result); List datas = Convert.convert(new TypeReference>() { }, result); - - List materialNos = datas.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); - //检查物料编码是否在主数据中存在 - List materialBaseInfo = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos); - List effectiveMaterialNos = materialBaseInfo.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); - Set difference = Sets.difference(new HashSet<>(materialNos), new HashSet<>(effectiveMaterialNos)); - VUtils.isTure(CollUtil.isNotEmpty(difference)).throwMessage(StrUtil.join(",", difference) + "在物料档案中不存在"); - - materialMainService.intiMaterialInfo(datas, BomNewEbomParentVO::getMaterialNo); EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_EXCE.getValue()); BomNewEBomParentEditDTO bomNewEBomParentEditDTO = new BomNewEBomParentEditDTO();