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

fix(ebom): 处理合并问题

This commit is contained in:
曹鹏飞 2024-05-17 14:19:43 +08:00
parent 7ddac0bae0
commit 3a5a787dc9
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,8 @@ public class CheckEBomException {
if (StrUtil.isBlank(vo.getMaterialDesc())) { if (StrUtil.isBlank(vo.getMaterialDesc())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue()); vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
} }
} else {if (StrUtil.isNotBlank(vo.getMaterialNo()) } else {
if (StrUtil.isNotBlank(vo.getMaterialNo())
&& (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState()) && (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState())
|| MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) { || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue()); vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
@ -143,9 +144,9 @@ public class CheckEBomException {
} else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit())
&& (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) { && (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue()); vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
} else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
} }
else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())){
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());}
} }
} }
checkOther(); checkOther();