From 28239b573a4be5e7678de8c65279153a7b17b760 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 18 六月 2023 16:47:49 +0800
Subject: [PATCH] #库位地图添加虚拟库位
---
src/main/java/com/zy/asrs/controller/MapController.java | 168 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 762d8ad..95a542e 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -112,80 +112,80 @@
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<=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 (bay ==7) {
- bay=bay+2;
+ if (row ==7) {
+ row=row+2;
}else{
- if (bay>7){
- bay=bay+locMast.getCrnNo()+1;
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
}else {
- bay=bay+locMast.getCrnNo()-1;
+ 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<=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 (bay % 10 == 0) {
- bay=bay+1;
+ if (row % 10 == 0) {
+ row=row+2;
}else{
- if (bay>10){
- bay=bay+locMast.getCrnNo();
+ if (row>10){
+ row=row+locMast.getCrnNo()+1;
}else {
- bay=bay+locMast.getCrnNo()-1;
+ 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<=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 (bay % 7 == 0) {
- bay=bay+1;
+ if (row % 7 == 0) {
+ row=row+2;
}else{
- if (bay>7){
- bay=bay+locMast.getCrnNo();
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
}else {
- bay=bay+locMast.getCrnNo()-1;
+ row=row+locMast.getCrnNo()-1;
}
}
break;
@@ -194,27 +194,39 @@
}
- 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);
- }
+ 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);
+
+
+
+// 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);
+// }
--
Gitblit v1.9.1