yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-06-19 16:31:42 +08:00
parent 52a92baf40 d9e292fb13
commit 1f75e3d31b
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmp/src/client/nccloud/web/cmp/informer/informer/action/myBtnClickAction.java
View File

@ -232,7 +232,7 @@ public class myBtnClickAction extends InformerAction implements ICommonAction {
vmao.put("paymentMethod", "10");
}
vmao.put("sourceId", row.get("pk_informer"));
vmao.put("bankrelated_code", row.get("bankrelated_code"));
vmao.put("bankrelatedCode", row.get("bankrelated_code"));
lists.add(vmao);
}

54
uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
View File

@ -200,8 +200,60 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
return ResultMessageUtil.toJSON(newAggVOList.toArray(new AggBomVO[0]), "100999",
"BOM保存提交成功部分成功部分失败", true);
} else {
ExceptionUtils.wrappBusinessException("未匹配到符合条件的三方注册用户账号【"+userCode+"】，请检查！！！");
try {
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
// 检查当前用户是否为排除用户
if (httpPostOtherSys.checkIfExcludeUser()) {
// 排除用户直接跳过同步处理，执行普通保存逻辑
for (AggBomVO aggvo : commitAggvoList) {
result = service.insertBom(new AggBomVO[] { aggvo });
newAggVOList.add(result[0]);
}
return ResultMessageUtil.toJSON(newAggVOList.toArray(new AggBomVO[0]), "BOM保存成功(排除用户)");
}
// 检查当前组织是否属于金思维MES同步组织(电缆组织)
String currentOrgCode = this.orgCodeFlag;
boolean isIncludeOrg = httpPostOtherSys.checkIfIncludeOrg(currentOrgCode);
if (isIncludeOrg) {
// 属于金思维MES同步组织，执行特殊处理逻辑
for (AggBomVO aggvo : commitAggvoList) {
result = service.insertCommitBomWithParam(new AggBomVO[] { aggvo }, true, true);
newAggVOList.add(result[0]);
}
return ResultMessageUtil.toJSON(newAggVOList.toArray(new AggBomVO[0]), "BOM保存成功(金思维MES同步组织)");
} else {
// 不属于金思维MES同步组织，执行默认处理逻辑
for (AggBomVO aggvo : commitAggvoList) {
try {
result = service.insertCommitBomWithParam_RequiresNew(new AggBomVO[] { aggvo }, true, true);
newAggVOList.add(result[0]);
} catch (Exception e) {
if (e.getMessage() != null) {
if (e.getMessage().length() > 100) {
aggvo.getParent().setAttributeValue("hvdef2", e.getMessage().substring(0, 100));
} else {
aggvo.getParent().setAttributeValue("hvdef2",
e.getMessage().substring(0, e.getMessage().length() - 1));
}
} else {
Throwable unmarsh = ExceptionUtils.unmarsh(e);
aggvo.getParent().setAttributeValue("hvdef2", "异常" + unmarsh.getMessage());
}
newAggVOList.add(aggvo);
}
}
return ResultMessageUtil.toJSON(newAggVOList.toArray(new AggBomVO[0]), "100999",
"BOM保存提交成功部分成功部分失败", true);
}
} catch (BusinessException e) {
// HTTP工具类调用失败时，回退到原有的异常处理
ExceptionUtils.wrappBusinessException("HTTP工具类判断失败：" + e.getMessage() + "，未匹配到符合条件的三方注册用户账号【"+userCode+"】，请检查！！！");
}
}
} else {
return ResultMessageUtil.exceptionToJSON("BOM保存失败,新增不允许单据状态自由或者空和审批通过同时存在", "999");
}