From 84334c663dba00af90b4a3ffe86a4d321f8d5deb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 九月 2023 16:23:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MapController.java | 181 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 164 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index e52e038..95a542e 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -31,14 +31,40 @@
}};
- @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 mapFilename = "map.json";
// String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
-// String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
- File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
+ //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
+ List<LocMast> locMasts = locMastService.selectLocByLev(lev);
+ switch (area){
+ case 1:
+ break;
+ case 2:
+ case 3:
+ mapFilename = "DTBnode.json";
+ locMasts = locMastService.selectNodeBLocByLev(lev);
+ break;
+ case 4:
+ mapFilename = "DTCnode.json";
+ locMasts = locMastService.selectNodeCLocByLev(lev);
+ break;
+ case 5:
+ mapFilename = "DTDnode.json";
+ locMasts = locMastService.selectNodeDLocByLev(lev);
+ break;
+ case 6:
+ mapFilename = "DTEnode.json";
+ locMasts = locMastService.selectNodeELocByLev(lev);
+ break;
+
+
+ }
+ 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);
StringBuffer stringBuffer = new StringBuffer();
if (file.isFile() && file.exists()) {
InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -68,29 +94,142 @@
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;
+
+ switch (area){
+ case 1:
+ if (row % 4 == 0 || (row+1) % 4 == 0) {
+ row=row+locMast.getCrnNo();
+ }else{
+ row=row+locMast.getCrnNo()-1;
+ }
+ bay=32-bay;
+ break;
+ case 2:
+ case 3:
+// if (row<=3 || row>=5){
+// if (row%1==0){
+// row=row+(row/1)-1;
+// }else {
+// row=row+((row+1)/1)-1;
+// }
+// }else {
+// if (row%2==0){
+// row=row+(row/2);
+// }else {
+// row=row+((row-1)/2);
+// }
+// }
+// if (row == 9){
+// row= row -1;
+// }
+
+ if (row ==7) {
+ row=row+2;
+ }else{
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
+ }else {
+ row=row+locMast.getCrnNo()-1;
+ }
+ }
+ break;
+ case 4:
+// if (row<=11){
+//// if (row%2==0){
+//// row=row+(row/2)-1;
+//// }else {
+//// row=row+((row+1)/2)-1;
+//// }
+//// }else {
+//// if (row%2==0){
+//// row=row+(row/2);
+//// }else {
+//// row=row+((row-1)/2);
+//// }
+//// }
+
+ if (row % 10 == 0) {
+ row=row+2;
+ }else{
+ if (row>10){
+ row=row+locMast.getCrnNo()+1;
+ }else {
+ row=row+locMast.getCrnNo()-1;
+ }
+ }
+ break;
+ case 5:
+// if (row<=11){
+// if (row%2==0){
+// row=row+(row/2)-1;
+// }else {
+// row=row+((row+1)/2)-1;
+// }
+// }else {
+// if (row%2==0){
+// row=row+(row/2);
+// }else {
+// row=row+((row-1)/2);
+// }
+// }
+
+ if (row % 7 == 0) {
+ row=row+2;
+ }else{
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
+ }else {
+ row=row+locMast.getCrnNo()-1;
+ }
+ }
+ break;
+
+
+
}
+
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);
+
+
+
+// if (area == 1 || area == 6){
+// 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$());//搴撲綅鐘舵��
+// //鏇存柊list
+// rowData.set(bay, jsonObject);
+// arrayLists.set(row, rowData);
+// }else {
+// ArrayList rowData = arrayLists.get(bay);
+// Object o = rowData.get(row);
+// JSONObject jsonObject = JSON.parseObject(o.toString());
+// jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+// jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
+// //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+// //鏇存柊list
+// rowData.set(row, jsonObject);
+// arrayLists.set(bay, rowData);
+// }
+
+
+
}
return JSONObject.toJSONString(arrayLists);
@@ -112,7 +251,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());
@@ -120,6 +259,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