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

Merge branch 'feature/DM/bug-projecttype' into test

This commit is contained in:
曹鹏飞 2024-09-11 10:11:51 +08:00
parent fe244d93f8 ffb2975ad6
commit 678379a69e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,6 +260,8 @@ public class EBomImportService {
dto.setUnit("PC"); dto.setUnit("PC");
} }
dto.setProjectType(StrUtil.trim(dto.getProjectType()));
if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) { if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) {
String id = RandomUtil.randomNumbers(9); String id = RandomUtil.randomNumbers(9);
dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id); dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java
View File

@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.base.core.exception.NflgBusinessException;
import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum; import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum;
import com.nflg.product.bomnew.pojo.dto.BomNewEBomImportExcelDTO; import com.nflg.product.bomnew.pojo.dto.BomNewEBomImportExcelDTO;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomChildVO;
import nflg.product.common.constant.STATE; import nflg.product.common.constant.STATE;
import java.util.List; import java.util.List;
@ -23,6 +22,7 @@ public class EBomImportExcelCheck {
List<String> projectTypeList= ProjectTypeInputTypeEnum.ProjectTypeEnum.getAllValue(); List<String> projectTypeList= ProjectTypeInputTypeEnum.ProjectTypeEnum.getAllValue();
for(BomNewEBomImportExcelDTO dto:list){ for(BomNewEBomImportExcelDTO dto:list){
dto.setProjectType(StrUtil.trim(dto.getProjectType()));
if(Objects.isNull(dto.getProjectType())){ if(Objects.isNull(dto.getProjectType())){
error.append(StrUtil.format("第%行,项目类别不能为空",count)); error.append(StrUtil.format("第%行,项目类别不能为空",count));
}else { }else {