From 4e7fb24723176b2403e100f578975bd8cf706c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 27 Aug 2024 19:00:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(dqbom):=20=E4=BC=98=E5=8C=96=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6T=E9=A1=B9=E7=89=A9=E6=96=99=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=88=AB=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/DQBomImportService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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");