From f34da12c558d57d156529e23c04e2388e60b94e5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 六月 2023 10:27:17 +0800
Subject: [PATCH] #组托逻辑
---
src/main/java/com/zy/asrs/controller/MapController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 2083b0a..33b65bc 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -44,11 +44,23 @@
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.selectNodeLocByLev(lev);
+ 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");
@@ -85,6 +97,7 @@
for (LocMast locMast : locMasts) {
+
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
@@ -99,6 +112,30 @@
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 (bay % 6 == 0) {
+ bay=bay+1;
+ }else{
+ if (bay>6){
+ bay=bay+locMast.getCrnNo();
+ }else {
+ bay=bay+locMast.getCrnNo()-1;
+ }
+ }
+ break;
case 4:
case 5:
if (row<=11){
@@ -130,7 +167,7 @@
}
- if (area == 1){
+ if (area == 1 || area == 6){
ArrayList rowData = arrayLists.get(row);
Object o = rowData.get(bay);
JSONObject jsonObject = JSON.parseObject(o.toString());
--
Gitblit v1.9.1