From aa310a47a05110a393c508921c92fa17ea95b491 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:08:12 +0800
Subject: [PATCH] 导入修改
---
src/main/java/com/zy/asrs/controller/MapController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 8cf5c35..826b77e 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -11,7 +11,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.*;
import java.io.*;
@@ -31,12 +30,15 @@
}};
- @GetMapping("/map/getData/{lev}/auth")
+ @GetMapping("/map/getData/auth")
@ManagerAuth
- public String getMapData(@PathVariable("lev") Integer lev) {
+ public String getMapData(@RequestParam Integer lev,@RequestParam Integer area) {
try {
String mapFilename = "map.json";
// String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
+ //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
+ List<LocMast> locMasts = locMastService.selectNodeLocByLev(lev);
+
String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
// File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
File file = new File(fileName);
@@ -69,29 +71,23 @@
arrayLists.set(row, rowData);
}
- //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.selectLocByLev(lev);
+
+
for (LocMast locMast : locMasts) {
+
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
- if (row<17){
- if (row % 4 == 0 || (row+1) % 4 == 0) {
- row=row+locMast.getCrnNo();
- }else{
- row=row+locMast.getCrnNo()-1;
- }
- }else {
- row=row-100+21;
- }
+
ArrayList rowData = arrayLists.get(row);
Object o = rowData.get(bay);
JSONObject jsonObject = JSON.parseObject(o.toString());
jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
- jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+ //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
//鏇存柊list
rowData.set(bay, jsonObject);
arrayLists.set(row, rowData);
+
}
return JSONObject.toJSONString(arrayLists);
@@ -113,7 +109,7 @@
@RequestParam("matnr") String matnr,
@RequestParam("maktx") String maktx
) {
- List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, locNo);
+ List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, "");
ArrayList<LocDetl> lists = new ArrayList<>();
for (LocDetl locDetl : locDetls) {//杩囨护鎺変笉鏄綋鍓嶆ゼ灞傜殑鏁版嵁
int lev1 = Utils.getLev(locDetl.getLocNo());
@@ -121,6 +117,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