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

物料主数据【物料申请】制作物料英文描述

This commit is contained in:
10001392 2024-09-02 17:57:41 +08:00
parent 848087523c
commit 542ceb23c1
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
View File

@ -248,7 +248,11 @@ public class MaterialExcelService {
List<MaterialCategoryEntity> cate22Ents = materialCategoryService.lambdaQuery() List<MaterialCategoryEntity> cate22Ents = materialCategoryService.lambdaQuery()
.eq(MaterialCategoryEntity::getRelCategoryCode, MaterialRelCategoryCodeEnum.relCategoryCode_22.getRelCategoryCode()).select(MaterialCategoryEntity::getCategoryCode).list(); .eq(MaterialCategoryEntity::getRelCategoryCode, MaterialRelCategoryCodeEnum.relCategoryCode_22.getRelCategoryCode()).select(MaterialCategoryEntity::getCategoryCode).list();
List<String> cate22List = cate22Ents.stream().map(MaterialCategoryEntity::getCategoryCode).collect(Collectors.toList()); List<String> cate22List = cate22Ents.stream().map(MaterialCategoryEntity::getCategoryCode).collect(Collectors.toList());
StringBuilder materialDescEnMsgBuilder = new StringBuilder();
boolean materialDescEnPass = true;
int counter = 1; // 第一行是表头
for (MaterialSelfExcelDTO excelEnt : datas) { for (MaterialSelfExcelDTO excelEnt : datas) {
counter++;
if (StringUtils.isNotEmpty(excelEnt.getMaterialType())) { if (StringUtils.isNotEmpty(excelEnt.getMaterialType())) {
MaterialMainGetTypeEnum materialMainGetTypeEnum = MaterialMainGetTypeEnum.findCodeByDescription(excelEnt.getMaterialType()); MaterialMainGetTypeEnum materialMainGetTypeEnum = MaterialMainGetTypeEnum.findCodeByDescription(excelEnt.getMaterialType());
if (materialMainGetTypeEnum == null) { if (materialMainGetTypeEnum == null) {
@ -297,8 +301,21 @@ public class MaterialExcelService {
excelEnt.setMaterialDescEn("Assembly before Shipment"); excelEnt.setMaterialDescEn("Assembly before Shipment");
} }
} }
if (!"201301".equals(excelEnt.getMaterialCategoryCode()) && ObjectUtil.isEmpty(excelEnt.getMaterialDescEn())) {
materialDescEnMsgBuilder.append("第");
materialDescEnMsgBuilder.append(counter);
materialDescEnMsgBuilder.append("行名称为“");
materialDescEnMsgBuilder.append(excelEnt.getMaterialName());
materialDescEnMsgBuilder.append("“");
materialDescEnPass = false;
}
} }
} }
// 检查英文描述不能为空
if (!materialDescEnPass) {
materialDescEnMsgBuilder.append("的物料命名不规范(未匹配到英文描述)");
throw new NflgBusinessException(STATE.ParamErr, materialDescEnMsgBuilder.toString());
}
//检查图号不能重复 //检查图号不能重复
List<String> drawingNoList = datas.stream().map(MaterialSelfExcelDTO::getDrawingNo).collect(Collectors.toList()); List<String> drawingNoList = datas.stream().map(MaterialSelfExcelDTO::getDrawingNo).collect(Collectors.toList());
@ -317,14 +334,6 @@ public class MaterialExcelService {
List<String> descDbExites = dbExitstDesc.stream().map(MaterialMainEntity::getMaterialDesc).collect(Collectors.toList()); List<String> descDbExites = dbExitstDesc.stream().map(MaterialMainEntity::getMaterialDesc).collect(Collectors.toList());
throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", descDbExites).concat("图号+名称在数据库中已存在")); throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", descDbExites).concat("图号+名称在数据库中已存在"));
} }
// 检查英文描述不能为空
List<MaterialSelfExcelDTO> emptyMaterialDescEnList = datas.stream()
.filter(item -> !"201301".equals(item.getMaterialCategoryCode()) && ObjectUtil.isEmpty(item.getMaterialDescEn()))
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(emptyMaterialDescEnList)) {
List<String> emptyDescEnList = emptyMaterialDescEnList.stream().map(MaterialSelfExcelDTO::getMaterialName).collect(Collectors.toList());
throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", emptyDescEnList).concat("未匹配到英文描述"));
}
List<MaterialMainEntity> result = Convert.convert(new TypeReference<List<MaterialMainEntity>>() { List<MaterialMainEntity> result = Convert.convert(new TypeReference<List<MaterialMainEntity>>() {
}, datas); }, datas);