diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java index 0a262516..2e24c5b7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java @@ -382,6 +382,9 @@ public class DQBomImportService { log.debug("电气bom导入excel,第{}行,处理前:{}", rowNum.get(), JSON.toJSONString(dQbomExcelVO)); dQbomExcelVO.setRowNum(rowNum.get()); + if (StrUtil.equals(dQbomExcelVO.getMaterialNo(), BomConstant.PROJECT_TYPE_TEMPORARY_MATERIAL_NO)) { + dQbomExcelVO.setProjectType(BomConstant.PROJECT_TYPE_TEMPORARY); + } if (dQbomExcelVO.getProjectType().equals(BomConstant.PROJECT_TYPE_TEMPORARY)) { String id = RandomUtil.randomNumbers(9); dQbomExcelVO.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id); @@ -393,9 +396,6 @@ public class DQBomImportService { dQbomExcelVO.setNum(BigDecimal.ONE); } } - if (StrUtil.equals(dQbomExcelVO.getMaterialNo(), BomConstant.PROJECT_TYPE_TEMPORARY_MATERIAL_NO)) { - dQbomExcelVO.setProjectType(BomConstant.PROJECT_TYPE_TEMPORARY); - } dQbomExcelVO.setCurrentVersion(""); if (StrUtil.isBlank(dQbomExcelVO.getProjectType())) { dQbomExcelVO.setProjectType("L");