root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复大屏

Browse Source
This commit is contained in:
liyongde
2023-04-26 15:25:12 +08:00
parent 1d66c65d7e
commit 6fe9a25ea1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -333,8 +333,8 @@ public class CockpitServiceImpl implements CockpitService{
existingLabels.add(dto.getLabel()); existingLabels.add(dto.getLabel());
} }
} }
// 检查 1、2、3、4 标签值是否全部存在，如果有缺失则创建新的 ProductionStatisticsDto 对象并添加到 result 列表中 // 检查 2、3、4 标签值是否全部存在，如果有缺失则创建新的 ProductionStatisticsDto 对象并添加到 result 列表中
for (int i = 1; i <= 4; i++) { for (int i = 2; i <= 4; i++) {
if (!existingLabels.contains(i+"")) { if (!existingLabels.contains(i+"")) {
result.add(ProductionStatisticsDto result.add(ProductionStatisticsDto
.builder() .builder()
@@ -345,6 +345,8 @@ public class CockpitServiceImpl implements CockpitService{
.build()); .build());
} }
} }
// 排序
Collections.sort(result, Comparator.comparing(dto -> Integer.parseInt(dto.getLabel())));
} }
/** /**

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PRODUCTION.wql
View File

@@ -146,6 +146,8 @@
GROUP BY GROUP BY
qtys.pick_type qtys.pick_type
) AS t2 ON t1.pick_type = t2.pick_type ) AS t2 ON t1.pick_type = t2.pick_type
WHERE
t1.pick_type <> '1'
ORDER BY t1.pick_type ORDER BY t1.pick_type
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY