fix: 电气专用bom添加T物料的描述是否为空异常检查
This commit is contained in:
parent
fc738cd40f
commit
9df131228d
|
|
@ -3,7 +3,6 @@ package com.nflg.product.bomnew.service;
|
|||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.nflg.product.bomnew.constant.BomConstant;
|
||||
import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum;
|
||||
import com.nflg.product.bomnew.constant.MaterialGetEnum;
|
||||
import com.nflg.product.bomnew.pojo.entity.BomNewDQbomChildEntity;
|
||||
|
|
@ -125,9 +124,11 @@ public class BomNewDQbomExceptionCheckService {
|
|||
EBomExceptionStatusEnum status = EBomExceptionStatusEnum.OK;
|
||||
if (parent.getRootIs() == 1 || parent.getUserRootIs() == 1) {
|
||||
if ("T".equals(parent.getProjectType())) {
|
||||
parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
|
||||
} else if (parent.getMaterialNo().startsWith(BomConstant.NO_TEMPORARY_PREFIX)) {
|
||||
status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
if (StrUtil.isBlank(parent.getMaterialName())) {
|
||||
status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
}
|
||||
// } else if (parent.getMaterialNo().startsWith(BomConstant.NO_TEMPORARY_PREFIX)) {
|
||||
// status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
} else {
|
||||
BaseMaterialVO materialVO = materialVOS.stream().filter(v -> v.getMaterialNo().equals(parent.getMaterialNo()))
|
||||
.findFirst()
|
||||
|
|
@ -163,9 +164,11 @@ public class BomNewDQbomExceptionCheckService {
|
|||
private void checkChild(BomNewDQbomChildEntity child) {
|
||||
EBomExceptionStatusEnum status = EBomExceptionStatusEnum.OK;
|
||||
if ("T".equals(child.getProjectType())) {
|
||||
child.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
|
||||
} else if (child.getMaterialNo().startsWith(BomConstant.NO_TEMPORARY_PREFIX)) {
|
||||
status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
if (StrUtil.isBlank(child.getMaterialName())) {
|
||||
status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
}
|
||||
// } else if (child.getMaterialNo().startsWith(BomConstant.NO_TEMPORARY_PREFIX)) {
|
||||
// status = EBomExceptionStatusEnum.EXCEPT_NO_4;
|
||||
} else {
|
||||
BaseMaterialVO materialVO = materialVOS.stream().filter(v -> v.getMaterialNo().equals(child.getMaterialNo()))
|
||||
.findFirst()
|
||||
|
|
|
|||
Loading…
Reference in New Issue