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:
mzr 2025-12-04 15:33:51 +08:00
parent 74664c8dd2 cfc94d9cdb
commit 867cdfdcf0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java
View File

@ -13,6 +13,7 @@ import nc.jdbc.framework.processor.MapListProcessor;
import nc.util.mmf.framework.base.MMCollectionUtil; import nc.util.mmf.framework.base.MMCollectionUtil;
import nc.util.mmf.framework.base.MMValueCheck; import nc.util.mmf.framework.base.MMValueCheck;
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO;
import nc.vo.pub.BusinessException; import nc.vo.pub.BusinessException;
import nc.ws.opm.pub.utils.result.APIErrCodeEnum; import nc.ws.opm.pub.utils.result.APIErrCodeEnum;
@ -418,12 +419,21 @@ public class PmoResource extends AbstractNCCRestResource {
String finalWhereSql = ""; String finalWhereSql = "";
if (!whereSql.isEmpty()) { if (!whereSql.isEmpty()) {
// 去掉开头的 " AND " // finalWhereSql = whereSql.substring(5);
finalWhereSql = whereSql.substring(5); finalWhereSql = " dr = 0 " + whereSql;
} }
// NCCForUAPLogger.debug("查询流程生产订单参数：" + finalWhereSql); // NCCForUAPLogger.debug("查询流程生产订单参数：" + finalWhereSql);
IPMOQueryService pmoQuery = NCLocator.getInstance().lookup(IPMOQueryService.class); IPMOQueryService pmoQuery = NCLocator.getInstance().lookup(IPMOQueryService.class);
PMOAggVO[] pmoAggVOS = pmoQuery.queryByWhereSql(finalWhereSql); PMOAggVO[] pmoAggVOS = pmoQuery.queryByWhereSql(finalWhereSql);
if (pmoAggVOS != null) {
for (PMOAggVO pmoAggVO : pmoAggVOS) {
if (pmoAggVO.getChildrenVO() == null || pmoAggVO.getChildrenVO().length == 0) {
PMOHeadVO headVO = pmoAggVO.getParentVO();
PMOItemVO[] itemVOS = pmoQuery.getPMOItemVOsByids(new String[]{headVO.getPrimaryKey()}, null);
pmoAggVO.setChildrenVO(itemVOS);
}
}
}
return ResultMessageUtil.toJSON(pmoAggVOS, "流程生产订单查询成功"); return ResultMessageUtil.toJSON(pmoAggVOS, "流程生产订单查询成功");
} catch (BusinessException e) { } catch (BusinessException e) {
return ResultMessageUtil.exceptionToJSON(e); return ResultMessageUtil.exceptionToJSON(e);