rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ebom): 优化从excel导入

This commit is contained in:
曹鹏飞 2024-05-20 09:58:47 +08:00
parent 2a982f0c45
commit bb56ba1b0c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
View File

@ -76,8 +76,7 @@ public class EbomV2Api extends BaseApi {
@ApiOperation("从excel导入数据") @ApiOperation("从excel导入数据")
@PostMapping("importBom") @PostMapping("importBom")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@LogRecord(success = "原始BOM-导入：文件名：{{#fileNme}},操作结果:{{#_ret}}", @LogRecord(success = "EBOM-导入：文件名：{{#fileNme}},操作结果:{{#_ret}}", bizNo = "", type = "EBOM导入")
bizNo = "", type = "原始BOM导入")
public ResultVO<List<OperationErrorMsgVO>> importBom(@RequestParam(value = "file") MultipartFile file) throws Exception { public ResultVO<List<OperationErrorMsgVO>> importBom(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) { if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) {
return ResultVO.error("请上传Excel文件"); return ResultVO.error("请上传Excel文件");

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
View File

@ -333,18 +333,22 @@ public class EBomImportService {
String maxOrderNum = pcs.get(pcs.size() - 1).getOrderNumber(); String maxOrderNum = pcs.get(pcs.size() - 1).getOrderNumber();
child.setOrderNumber(OrderNoUtil.next(maxOrderNum)); child.setOrderNumber(OrderNoUtil.next(maxOrderNum));
} }
child.setMaterialDesc(data.getMaterialDesc());
BaseMaterialVO vo = materialBaseInfos.stream() BaseMaterialVO vo = materialBaseInfos.stream()
.filter(m -> m.getMaterialNo().equals(child.getMaterialNo())) .filter(m -> m.getMaterialNo().equals(child.getMaterialNo()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (!Objects.isNull(vo)) { if (!Objects.isNull(vo)) {
child.setMaterialCategoryCode(vo.getMaterialCategoryCode()); child.setMaterialCategoryCode(vo.getMaterialCategoryCode());
child.setMaterialName(vo.getMaterialName());
child.setDrawingNo(vo.getDrawingNo()); child.setDrawingNo(vo.getDrawingNo());
child.setUnitWeight(vo.getMaterialWeight()); child.setUnitWeight(vo.getMaterialWeight());
child.setMaterialUnit(vo.getMaterialUnit()); child.setMaterialUnit(vo.getMaterialUnit());
child.setMaterialTexture(vo.getMaterialTexture()); child.setMaterialTexture(vo.getMaterialTexture());
if (StrUtil.isBlank(child.getMaterialDesc())) {
child.setMaterialDesc(vo.getMaterialDesc());
}
} }
child.setMaterialDesc(data.getMaterialDesc());
child.setMaterialOriginalUnit(data.getUnit()); child.setMaterialOriginalUnit(data.getUnit());
child.setNum(data.getNum()); child.setNum(data.getNum());
child.setRemark(data.getRemark()); child.setRemark(data.getRemark());