|
|
@ -41,7 +41,11 @@ public class MesProductionRecordImpl implements IMesProductionRecordDao {
|
|
|
|
if (!CollectionUtils.isEmpty(workCenterList)) {
|
|
|
|
if (!CollectionUtils.isEmpty(workCenterList)) {
|
|
|
|
hql.append(" and record.workCenterCode not in (: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);
|
|
|
|
Query hqlQuery = entityManager.createQuery(hql.toString(), MesProductionRecord.class);
|
|
|
|
hqlQuery.setParameter("organizeCode", organizeCode);
|
|
|
|
hqlQuery.setParameter("organizeCode", organizeCode);
|
|
|
|
hqlQuery.setParameter("isValid", CommonEnumUtil.VALID);
|
|
|
|
hqlQuery.setParameter("isValid", CommonEnumUtil.VALID);
|
|
|
|