optimize(移动破mbom): 导入SAP状态值调整
This commit is contained in:
parent
d4788a1d4a
commit
7ff168fd1a
|
|
@ -133,6 +133,18 @@ public class OptionalBomConstant {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Getter
|
||||||
|
public enum UploadSapStatusEnum {
|
||||||
|
//是否导入sap(0 :否 1: 是)
|
||||||
|
SAP_0(0, "未导入"),
|
||||||
|
SAP_1(1, "已导入"),
|
||||||
|
SAP_2(2, "导入中"),
|
||||||
|
SAP_3(3, "部分导入失败"),
|
||||||
|
SAP_4(4, "全部导入失败");
|
||||||
|
|
||||||
|
private final Integer value;
|
||||||
|
private final String description;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ import com.nflg.product.base.core.conmon.util.SessionUtil;
|
||||||
import com.nflg.product.base.core.exception.NflgBusinessException;
|
import com.nflg.product.base.core.exception.NflgBusinessException;
|
||||||
import com.nflg.product.bomnew.constant.BomConstant;
|
import com.nflg.product.bomnew.constant.BomConstant;
|
||||||
import com.nflg.product.bomnew.constant.OptionalBomConstant;
|
import com.nflg.product.bomnew.constant.OptionalBomConstant;
|
||||||
import com.nflg.product.bomnew.constant.SapStatusEnum;
|
|
||||||
import com.nflg.product.bomnew.mapper.master.OptionalMbomMaterialMapper;
|
import com.nflg.product.bomnew.mapper.master.OptionalMbomMaterialMapper;
|
||||||
import com.nflg.product.bomnew.pojo.dto.OptionalMbomMaterialAddDTO;
|
import com.nflg.product.bomnew.pojo.dto.OptionalMbomMaterialAddDTO;
|
||||||
import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
|
import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
|
||||||
|
|
@ -164,15 +163,15 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
|
||||||
|
|
||||||
//log.info(JSON.toJSONString(result));
|
//log.info(JSON.toJSONString(result));
|
||||||
|
|
||||||
SapStatusEnum state = SapStatusEnum.PUB_ERROR_ALL;
|
OptionalBomConstant.UploadSapStatusEnum state = OptionalBomConstant.UploadSapStatusEnum.SAP_4;
|
||||||
List<OperationErrorMsgVO> liErrMsg = null;
|
List<OperationErrorMsgVO> liErrMsg = null;
|
||||||
try {
|
try {
|
||||||
updateSapState(entity.getRootRowId(), SapStatusEnum.PUB_RUNNING);
|
updateSapState(entity.getRootRowId(), OptionalBomConstant.UploadSapStatusEnum.SAP_2);
|
||||||
liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(result, null);
|
liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(result, null);
|
||||||
if (CollUtil.isEmpty(liErrMsg)) {
|
if (CollUtil.isEmpty(liErrMsg)) {
|
||||||
state = SapStatusEnum.PUB_SUCCESS;
|
state = OptionalBomConstant.UploadSapStatusEnum.SAP_1;
|
||||||
} else if (result.getT1().size() != liErrMsg.size()) {
|
} else if (result.getT1().size() != liErrMsg.size()) {
|
||||||
state = SapStatusEnum.PUB_ERROR;
|
state = OptionalBomConstant.UploadSapStatusEnum.SAP_3;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
updateSapState(entity.getRootRowId(), state);
|
updateSapState(entity.getRootRowId(), state);
|
||||||
|
|
@ -180,7 +179,7 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
|
||||||
return ResultVO.success(liErrMsg);
|
return ResultVO.success(liErrMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
|
private void updateSapState(Long rootBomRowId, OptionalBomConstant.UploadSapStatusEnum sapState) {
|
||||||
SpringUtil.getBean(OptionalEbomConfigService.class)
|
SpringUtil.getBean(OptionalEbomConfigService.class)
|
||||||
.lambdaUpdate()
|
.lambdaUpdate()
|
||||||
.eq(OptionalEbomConfigEntity::getRowId, rootBomRowId)
|
.eq(OptionalEbomConfigEntity::getRowId, rootBomRowId)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue