diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java index e0af0cf..e8d2775 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java @@ -41,7 +41,11 @@ public class MesProductionRecordImpl implements IMesProductionRecordDao { if (!CollectionUtils.isEmpty(workCenterList)) { hql.append(" and record.workCenterCode not in (:workCenterList)"); } - hql.append(" order by record.reportStatus asc,record.createDatetime asc "); + if(MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workOrderType){ + hql.append(" order by record.reportStatus asc,record.modifyDatetime asc "); + }else{ + hql.append(" order by record.modifyDatetime asc "); + } Query hqlQuery = entityManager.createQuery(hql.toString(), MesProductionRecord.class); hqlQuery.setParameter("organizeCode", organizeCode); hqlQuery.setParameter("isValid", CommonEnumUtil.VALID);