diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java index 906ef9cd..ff509b2c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java @@ -76,8 +76,7 @@ public class EbomV2Api extends BaseApi { @ApiOperation("从excel导入数据") @PostMapping("importBom") @Transactional(rollbackFor = Exception.class) - @LogRecord(success = "原始BOM-导入:文件名:{{#fileNme}},操作结果:{{#_ret}}", - bizNo = "", type = "原始BOM导入") + @LogRecord(success = "EBOM-导入:文件名:{{#fileNme}},操作结果:{{#_ret}}", bizNo = "", type = "EBOM导入") public ResultVO> importBom(@RequestParam(value = "file") MultipartFile file) throws Exception { if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) { return ResultVO.error("请上传Excel文件"); 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 2e777592..66301957 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 @@ -333,18 +333,22 @@ public class EBomImportService { String maxOrderNum = pcs.get(pcs.size() - 1).getOrderNumber(); child.setOrderNumber(OrderNoUtil.next(maxOrderNum)); } + child.setMaterialDesc(data.getMaterialDesc()); BaseMaterialVO vo = materialBaseInfos.stream() .filter(m -> m.getMaterialNo().equals(child.getMaterialNo())) .findFirst() .orElse(null); if (!Objects.isNull(vo)) { child.setMaterialCategoryCode(vo.getMaterialCategoryCode()); + child.setMaterialName(vo.getMaterialName()); child.setDrawingNo(vo.getDrawingNo()); child.setUnitWeight(vo.getMaterialWeight()); child.setMaterialUnit(vo.getMaterialUnit()); child.setMaterialTexture(vo.getMaterialTexture()); + if (StrUtil.isBlank(child.getMaterialDesc())) { + child.setMaterialDesc(vo.getMaterialDesc()); + } } - child.setMaterialDesc(data.getMaterialDesc()); child.setMaterialOriginalUnit(data.getUnit()); child.setNum(data.getNum()); child.setRemark(data.getRemark());