From e6ec6cd0e0fab11bf79f052be352a66db2dd51d3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 13:18:54 +0800
Subject: [PATCH] 项目搭建完成
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 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..7944eb3 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,6 +35,9 @@
private LocDetlService locDetlService;
@Autowired
private ReportQueryMapper reportQueryMapper;
+
+ @Resource
+ private ManLocDetlMapper manLocDetlMapper;
//------------------搴撲綅浣跨敤缁熻--------------------------------------
@RequestMapping("/viewStockUseList.action")
@@ -91,11 +96,80 @@
//-----------------搴撳瓨MAP鍥�--------------------------------------
@RequestMapping("/viewLocMapList/rows.action")
public R queryViewLocMapRows(){
- return R.ok().add(reportQueryMapper.getViewLocRowTotal());
+ List<Integer> viewLocRowTotal = reportQueryMapper.getViewLocRowTotal();
+ viewLocRowTotal.add(9);
+ viewLocRowTotal.add(10);
+ return R.ok().add(viewLocRowTotal);
}
@RequestMapping("/viewLocMapList.action")
- public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
+ public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row) {
+ if (row == 9) {
+ // 鑾峰彇鎺掔骇鏁版嵁
+ // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
+// List<String> bays = new ArrayList<>();
+ String[] bays = new String[33];
+ for (int i = 1; i <= 32; i ++) {
+ bays[i] = String.valueOf(i);
+ }
+
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ bays[0] = "";
+ // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
+ List<String> levs = new ArrayList<>();
+ for (int i = 5; i>= 1; i --) {
+ levs.add(String.valueOf(i));
+ }
+ List<Map<String, Object>> body = new ArrayList<>();
+ for (String lev : levs){
+ // 鑾峰彇灞傜骇鏁版嵁
+// List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
+ List<ViewLocMapDto> dtos = manLocDetlMapper.getViewLocBays(String.valueOf(row), lev);
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ dtos.add(0, new ViewLocMapDto(null ,null, lev));
+ Map<String, Object> map = new HashMap<>();
+ map.put("loc", dtos);
+ body.add(map);
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("title", bays);
+ result.put("body", body);
+ return R.ok(result);
+ } else if( row == 10) {
+ // 鑾峰彇鎺掔骇鏁版嵁
+ // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
+// List<String> bays = new ArrayList<>();
+ String[] bays = new String[33];
+ for (int i = 1; i <= 32; i ++) {
+ bays[i] = String.valueOf(i);
+ }
+
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ bays[0] = "";
+ // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
+ List<String> levs = new ArrayList<>();
+ for (int i = 5; i>= 1; i --) {
+ levs.add(String.valueOf(i));
+ }
+ List<Map<String, Object>> body = new ArrayList<>();
+ for (String lev : levs){
+ // 鑾峰彇灞傜骇鏁版嵁
+// List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
+ List<ViewLocMapDto> dtos = manLocDetlMapper.getViewLocBays(String.valueOf(row), lev);
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ dtos.add(0, new ViewLocMapDto(null ,null, lev));
+ for (int i = 15;i <= 18; i ++) {
+ dtos.add(i,new ViewLocMapDto(null ,i, "X"));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("loc", dtos);
+ body.add(map);
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("title", bays);
+ result.put("body", body);
+ return R.ok(result);
+ } else {
// 鑾峰彇鎺掔骇鏁版嵁
// 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
List<String> bays = reportQueryMapper.getViewLocBayCount(row);
@@ -118,6 +192,7 @@
result.put("body", body);
return R.ok(result);
}
+ }
//------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
--
Gitblit v1.9.1