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

物料主数据 

1、【物料申请】制作物料英文描述
This commit is contained in:
10001392 2024-09-02 11:19:37 +08:00
parent 7e6aafd545
commit 91be7b8de1
4 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,19 @@ public class MaterialExcelService {
excelEnt.setProcessState(MaterialProcessStateEnum.WAIT_SUBMIT.getValue());
if (ObjectUtil.isNotEmpty(excelEnt.getMaterialName())) {
excelEnt.setMaterialDescEn(query21MaterialDescEn(excelEnt.getMaterialName().split(" ")[0]));
if ("201101".equals(excelEnt.getMaterialCategoryCode())) {
if (excelEnt.getMaterialName().endsWith("(发货)")) {
excelEnt.setMaterialDescEn("Deliver Goods Package");
} else if (excelEnt.getMaterialName().endsWith("(制作)")) {
excelEnt.setMaterialDescEn("Make Package");
} else if (excelEnt.getMaterialName().endsWith("(直发)")) {
excelEnt.setMaterialDescEn("Inventory Deliver Goods Package");
} else if (excelEnt.getMaterialName().endsWith("(油漆)")) {
excelEnt.setMaterialDescEn("Paint Package");
} else if (excelEnt.getMaterialName().endsWith("(发货前装配)")) {
excelEnt.setMaterialDescEn("Assembly before Shipment");
}
}
}
}
@ -304,6 +317,14 @@ public class MaterialExcelService {
List<String> descDbExites = dbExitstDesc.stream().map(MaterialMainEntity::getMaterialDesc).collect(Collectors.toList());
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>>() {
}, datas);

12
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
View File

@ -1202,14 +1202,14 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
*/
public void initPic(MaterialMainVO data) {
MaterialFilesEntity file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
if (Objects.isNull(file)) {
file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
}
if (Objects.isNull(file)) {
file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
}
if (!Objects.isNull(file)) {
data.setPicUrl(file.getFileUrl());
@ -1223,14 +1223,14 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
*/
public void initPic2(MaterialMainVO data) {
MaterialFilesEntity file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, String.valueOf(data.getRowId())).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
if (Objects.isNull(file)) {
file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialNo()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
}
if (Objects.isNull(file)) {
file = materialFilesService.lambdaQuery().eq(MaterialFilesEntity::getFileType, 0)
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).one();
.eq(MaterialFilesEntity::getMaterialOrCategoryNo, data.getMaterialCategoryCode()).orderByDesc(MaterialFilesEntity::getCreatedTime).last(" limit 1").one();
}
if (!Objects.isNull(file)) {
data.setPicUrl(file.getFileUrl());

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/MaterialMainEntity.java
View File

@ -53,6 +53,13 @@ public class MaterialMainEntity implements Serializable {
@ApiModelProperty(value = "物料描述")
private String materialDesc;
/**
* 英文描述
*/
@TableField(value = "material_desc_en")
@ApiModelProperty(value = "英文描述")
private String materialDescEn;
/**
* 物料描述(简写)
*/

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

@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSON;
@ -206,6 +207,7 @@ public class MaterialService {
ma.setProjectType(md.getProjectType());
}
ma.setMaterialGetType(md.getMaterialGetType());
this.get201101MaterialDescEn(ma);
resultList.add(ma);
AddMaterialMainDTO ent = new AddMaterialMainDTO();
@ -236,6 +238,22 @@ public class MaterialService {
return result;
}
private void get201101MaterialDescEn(MaterialMainEntity ma) {
if ("201101".equals(ma.getMaterialCategoryCode()) && ObjectUtil.isNotEmpty(ma.getMaterialName())) {
if (ma.getMaterialName().endsWith("(发货)")) {
ma.setMaterialDescEn("Deliver Goods Package");
} else if (ma.getMaterialName().endsWith("(制作)")) {
ma.setMaterialDescEn("Make Package");
} else if (ma.getMaterialName().endsWith("(直发)")) {
ma.setMaterialDescEn("Inventory Deliver Goods Package");
} else if (ma.getMaterialName().endsWith("(油漆)")) {
ma.setMaterialDescEn("Paint Package");
} else if (ma.getMaterialName().endsWith("(发货前装配)")) {
ma.setMaterialDescEn("Assembly before Shipment");
}
}
}
public Map<String, AddVirtrualMaterialDTO> batchAddMaterial(List<AddVirtrualMaterialDTO> mds) {
return batchAddMaterial(mds, SessionUtil.getUser());
}