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

Merge remote-tracking branch 'origin/master-hlq20241114sapMsg'

This commit is contained in:
10001392 2024-11-14 17:39:33 +08:00
parent 888a222c71 8d5dcc464f
commit 0a3c5cdcdb
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.nflg.product.bomnew.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
@ -100,6 +101,7 @@ public class BomNewEbomExportToSAP {
// } // }
liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(sapDto, null); liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(sapDto, null);
this.tempHandleSapErrMsg(liErrMsg);
if (CollUtil.isEmpty(liErrMsg)) { if (CollUtil.isEmpty(liErrMsg)) {
state = SapStatusEnum.PUB_SUCCESS; state = SapStatusEnum.PUB_SUCCESS;
} else if (sapDto.getT1().size() != liErrMsg.size()) { } else if (sapDto.getT1().size() != liErrMsg.size()) {
@ -123,6 +125,17 @@ public class BomNewEbomExportToSAP {
return liErrMsg; return liErrMsg;
} }
// 仙桃用户EBOM导入SAP报错情况：SAP信息含有“在工厂1010中未被维护”，不算报错
private void tempHandleSapErrMsg(List<OperationErrorMsgVO> liErrMsg) {
if (CollUtil.isEmpty(liErrMsg)) {
return;
}
List<OperationErrorMsgVO> filterList = liErrMsg.stream().filter(item -> ObjectUtil.isNotEmpty(item.msg) && item.msg.contains("在工厂1010中未被维护")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(filterList) && ObjectUtil.isNotEmpty(SessionUtil.getFullDeptName()) && SessionUtil.getFullDeptName().contains("仙桃")) {
liErrMsg.removeAll(filterList);
}
}
/** /**
* 单层导入，过滤出指定父级物料号的子级即可 * 单层导入，过滤出指定父级物料号的子级即可
* @param materialNo 父级物料号 * @param materialNo 父级物料号