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 86fbbaed..dee2ed6c 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 @@ -260,6 +260,8 @@ public class EBomImportService { dto.setUnit("PC"); } + dto.setProjectType(StrUtil.trim(dto.getProjectType())); + if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) { String id = RandomUtil.randomNumbers(9); dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java index 6bc54f54..f8ff398b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum; import com.nflg.product.bomnew.pojo.dto.BomNewEBomImportExcelDTO; -import com.nflg.product.bomnew.pojo.vo.BomNewEbomChildVO; import nflg.product.common.constant.STATE; import java.util.List; @@ -23,6 +22,7 @@ public class EBomImportExcelCheck { List projectTypeList= ProjectTypeInputTypeEnum.ProjectTypeEnum.getAllValue(); for(BomNewEBomImportExcelDTO dto:list){ + dto.setProjectType(StrUtil.trim(dto.getProjectType())); if(Objects.isNull(dto.getProjectType())){ error.append(StrUtil.format("第%行,项目类别不能为空",count)); }else {