Merge branch 'uat-temp-wj-2501090000-44746' into dev

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

@@ -138,7 +138,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo
                     " b.shift_code AS shiftCode, " +
                     " ' ' AS equipmentCode, " +
                     " ' ' AS equipmentName, " +
-                    " 30 AS reportStatus, " +
+                    " b.type AS reportStatus, " +
                     " 2 AS dataSource, " +
                     " SUM( modify_qty ) AS statisticsQty " +
                     " FROM ");
@@ -149,8 +149,12 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo
                     " AND b.is_deleted = :isDeleted " +
                     " AND b.is_valid = :isValid " +
                     " AND b.modify_date_time >= :completeDateTimeStart " +
-                    " AND b.modify_date_time <= :completeDateTimeEnd " +
+                    " AND b.modify_date_time <= :completeDateTimeEnd ");
-                    " AND b.type = :messageType ");
+            if (reportStatusList2Wo.size() == 1) {
+                woQueryHql.append(" AND b.type = :messageType ");
+            } else {
+                woQueryHql.append(" AND b.type in (:messageType) ");
+            }
             if (!StringUtils.isEmpty(model.getPartNo())) {
                 woQueryHql.append(" AND b.part_no = :partNo ");
             }