工单加工记录报表增加工单标识字段查询条件

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java

@@ -163,7 +163,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
     @Override
     public ListPager<MesProductionRecordModel> queryMesProductionRecord(MesProductionRecordModel model, Pager pager) {
         StringBuilder dataHql = new StringBuilder();
-        dataHql.append(" select new ").append(MesProductionRecordModel.class.getName()).append("(record,wo.workOrderStatus)");
+        dataHql.append(" select new ").append(MesProductionRecordModel.class.getName()).append("(record,wo.workOrderStatus,wo.orderFlag)");
         //共用HQL
         String commonHql = getMesProductionRecordCommonHql(model);
         //行数
@@ -288,6 +288,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
         if (!StringUtils.isEmpty(model.getReportType()) && model.getReportType() > MesExtConstWords.ZERO) commonHql.append(" and record.reportType = :reportType ");
         if (!StringUtils.isEmpty(model.getIsComplete()) && model.getIsComplete() > MesExtConstWords.ZERO) commonHql.append(" and record.isComplete = :isComplete ");
         if (!StringUtils.isEmpty(model.getWorkOrderStatus()) && model.getWorkOrderStatus() > MesExtConstWords.ZERO) commonHql.append(" and wo.workOrderStatus = :workOrderStatus ");
+        if (!StringUtils.isEmpty(model.getOrderFlag())) commonHql.append(" and wo.orderFlag = :orderFlag ");
         if (!StringUtils.isEmpty(model.getIsTest())) commonHql.append(" and record.isTest like '%").append(model.getIsTest()).append("%' ");
         if (!StringUtils.isEmpty(model.getPartNo())) commonHql.append(" and record.partNo like '%").append(model.getPartNo()).append("%' ");
         if (!StringUtils.isEmpty(model.getPartName())) commonHql.append(" and record.partName like '%").append(model.getPartName()).append("%' ");
@@ -302,6 +303,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
         if(!StringUtils.isEmpty(model.getCompleteDateTimeStart())) query.setParameter("completeDateTimeStart", model.getCompleteDateTimeStart());
         if (!StringUtils.isEmpty(model.getCompleteDateTimeEnd())) query.setParameter("completeDateTimeEnd", model.getCompleteDateTimeEnd());
         if (!StringUtils.isEmpty(model.getReportStatus()) && model.getReportStatus() > MesExtConstWords.ZERO) query.setParameter("reportStatus", model.getReportStatus());
+        if (!StringUtils.isEmpty(model.getOrderFlag()))  query.setParameter("orderFlag", model.getOrderFlag());
         if (!StringUtils.isEmpty(model.getReportType()) && model.getReportType() > MesExtConstWords.ZERO) query.setParameter("reportType", model.getReportType());
         if (!StringUtils.isEmpty(model.getIsComplete()) && model.getIsComplete() > MesExtConstWords.ZERO) query.setParameter("isComplete", model.getIsComplete());
         if (!StringUtils.isEmpty(model.getWorkOrderStatus()) && model.getWorkOrderStatus() > MesExtConstWords.ZERO) query.setParameter("workOrderStatus", model.getWorkOrderStatus());