From 1dac1ea1fa04f562a75292070a828ba1a44d143f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 16:39:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MapController.java | 82 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index ff28fab..487c9d1 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -15,8 +15,8 @@
import java.io.*;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-import java.util.Objects;
@RestController
@@ -28,17 +28,6 @@
private LocDetlService locDetlService;
private static final List<String> DISABLE_LOC_NO = new ArrayList<String>() {{
- add("0200101");
- add("0300101");
- add("0400101");
- add("0500101");
- add("0600101");
- add("0700101");
- add("0800101");
- add("0900101");
- add("1000101");
- add("1100101");
- add("1200101");
}};
@GetMapping("/map/getData/{lev}/auth")
@@ -46,7 +35,7 @@
public String getMapData(@PathVariable("lev") Integer lev) {
try {
String mapFilename = "map.json";
- String fileName = Objects.requireNonNull(this.getClass().getClassLoader().getResource(mapFilename)).getPath();//鑾峰彇鏂囦欢璺緞
+ String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
File file = new File(fileName);
StringBuffer stringBuffer = new StringBuffer();
if (file.isFile() && file.exists()) {
@@ -60,39 +49,58 @@
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(stringBuffer.toString(), ArrayList.class);
- for (String locNo : DISABLE_LOC_NO) {//绂佺敤璁剧疆搴撲綅
- int row = Utils.getRow(locNo);
- int bay = Utils.getBay(locNo);
- if (row >= 2 && row <= 12) {
- row++;
- }else if (row == 13) {
- row += 2;
+ ArrayList<HashMap<String, Integer>> lineRows = new ArrayList<>();
+ int dataRow = 0;
+ int dataRowCount = 0;
+ for (int i = 1; i < arrayLists.size(); i++) {
+ boolean flag = true;
+ ArrayList rows = arrayLists.get(i);
+ for (int j = 1; j < rows.size() - 1; j++) {
+ Object o = rows.get(j);
+ JSONObject jsonObject = JSON.parseObject(o.toString());
+ int value = Integer.parseInt(jsonObject.get("value").toString());
+ if (value >= 0 && value != 3) {
+ //鍙湁璇ヨ涓殑浠讳竴涓�鍒楁湁鏁版嵁锛屽垯涓嶉渶瑕佸垱寤虹┖鐧借
+ flag = false;
+ }
}
- ArrayList rowData = arrayLists.get(row);
- Object o = rowData.get(bay);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
- //鏇存柊list
- rowData.set(bay, jsonObject);
- arrayLists.set(row, rowData);
+
+ if (flag) {
+ //绌虹櫧琛岄渶瑕佽烦杩�
+ HashMap<String, Integer> map = new HashMap<>();
+ map.put("start", dataRow);
+ int end = i - 1 - dataRowCount;
+ map.put("end", end);
+ map.put("count", dataRowCount);
+ dataRow = end;
+ dataRowCount++;
+ lineRows.add(map);
+ }
}
//鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
List<LocMast> locMasts = locMastService.selectLocByLev(lev);
+
for (LocMast locMast : locMasts) {
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
- if (row >= 2 && row <= 12) {
- row++;
- }else if (row == 13) {
- row += 2;
+ for (HashMap<String, Integer> lineRow : lineRows) {
+ if (row > lineRow.get("start") && row <= lineRow.get("end")) {
+ row += lineRow.get("count");
+ break;
+ }
}
ArrayList rowData = arrayLists.get(row);
Object o = rowData.get(bay);
JSONObject jsonObject = JSON.parseObject(o.toString());
+ if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
+ //绂佹搴撲綅
+ jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
+ }
jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
- jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+ jsonObject.put("lockLocMast", locMast.getLocType3$());
+
//鏇存柊list
rowData.set(bay, jsonObject);
arrayLists.set(row, rowData);
@@ -116,7 +124,7 @@
@RequestParam("specs") String specs,
@RequestParam("matnr") String matnr,
@RequestParam("maktx") String maktx
- ) {
+ ) {
List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, locNo);
ArrayList<LocDetl> lists = new ArrayList<>();
for (LocDetl locDetl : locDetls) {//杩囨护鎺変笉鏄綋鍓嶆ゼ灞傜殑鏁版嵁
@@ -125,6 +133,14 @@
lists.add(locDetl);
}
}
+
+ //鎼滅储鎸囧畾搴撲綅鍙凤紝鍗充娇搴撲綅涓虹┖锛屼篃鍙互杩斿洖鏁版嵁
+ LocMast locMast = locMastService.selectById(locNo);
+ if (locMast != null) {
+ LocDetl locDetl = new LocDetl();
+ locDetl.setLocNo(locMast.getLocNo());
+ lists.add(locDetl);
+ }
return R.ok().add(lists);
}
--
Gitblit v1.9.1