diff --git a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java index 317b7891..b52cc906 100644 --- a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java +++ b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java @@ -13,6 +13,7 @@ import nc.jdbc.framework.processor.MapListProcessor; import nc.util.mmf.framework.base.MMCollectionUtil; import nc.util.mmf.framework.base.MMValueCheck; 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.pub.BusinessException; import nc.ws.opm.pub.utils.result.APIErrCodeEnum; @@ -418,12 +419,21 @@ public class PmoResource extends AbstractNCCRestResource { String finalWhereSql = ""; if (!whereSql.isEmpty()) { - // 去掉开头的 " AND " - finalWhereSql = whereSql.substring(5); + // finalWhereSql = whereSql.substring(5); + finalWhereSql = " dr = 0 " + whereSql; } // NCCForUAPLogger.debug("查询流程生产订单参数:" + finalWhereSql); IPMOQueryService pmoQuery = NCLocator.getInstance().lookup(IPMOQueryService.class); 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, "流程生产订单查询成功"); } catch (BusinessException e) { return ResultMessageUtil.exceptionToJSON(e);