From a77cf677874a6aba1784222188072dd442a862d5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 19 五月 2023 12:09:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..2871f11 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -104,14 +104,26 @@
// 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
List<String> levs = reportQueryMapper.getViewLocLevCount(row);
List<Map<String, Object>> body = new ArrayList<>();
- for (String lev : levs){
+ int maxBay=0;
+ for (String lev : levs) {
// 鑾峰彇灞傜骇鏁版嵁
List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
// 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- dtos.add(0, new ViewLocMapDto(null ,null, lev));
+ dtos.add(0, new ViewLocMapDto(null, null, lev));
Map<String, Object> map = new HashMap<>();
map.put("loc", dtos);
body.add(map);
+ if (row == 100) {
+ if (maxBay < locDetlService.queryStockViewMergeCount(row, Integer.parseInt(lev))) {
+ maxBay = locDetlService.queryStockViewMergeCount(row, Integer.parseInt(lev));
+ }
+ }
+ }
+
+ if (row==100){
+ for (int i =bays.size()-1;i>maxBay;i--){
+ bays.remove(i);
+ }
}
Map<String, Object> result = new HashMap<>();
result.put("title", bays);
--
Gitblit v1.9.1