diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 5087b46..ff91806 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -333,8 +333,8 @@ public class CockpitServiceImpl implements CockpitService{ existingLabels.add(dto.getLabel()); } } - // 检查 1、2、3、4 标签值是否全部存在,如果有缺失则创建新的 ProductionStatisticsDto 对象并添加到 result 列表中 - for (int i = 1; i <= 4; i++) { + // 检查 2、3、4 标签值是否全部存在,如果有缺失则创建新的 ProductionStatisticsDto 对象并添加到 result 列表中 + for (int i = 2; i <= 4; i++) { if (!existingLabels.contains(i+"")) { result.add(ProductionStatisticsDto .builder() @@ -345,6 +345,8 @@ public class CockpitServiceImpl implements CockpitService{ .build()); } } + // 排序 + Collections.sort(result, Comparator.comparing(dto -> Integer.parseInt(dto.getLabel()))); } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PRODUCTION.wql b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PRODUCTION.wql index 2004df8..cc0ec5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PRODUCTION.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PRODUCTION.wql @@ -146,6 +146,8 @@ GROUP BY qtys.pick_type ) AS t2 ON t1.pick_type = t2.pick_type + WHERE + t1.pick_type <> '1' ORDER BY t1.pick_type ENDSELECT ENDPAGEQUERY