From b9ad54657bcfdd324cdac66fa2d6aff6705b7370 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 15:06:15 +0800
Subject: [PATCH] Revert "出入库日志优化"
---
src/main/java/com/zy/asrs/controller/MapController.java | 117 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 5bcad57..762d8ad 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,8 +112,73 @@
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 (bay ==7) {
+ bay=bay+2;
+ }else{
+ if (bay>7){
+ bay=bay+locMast.getCrnNo()+1;
+ }else {
+ bay=bay+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 (bay % 10 == 0) {
+ bay=bay+1;
+ }else{
+ if (bay>10){
+ bay=bay+locMast.getCrnNo();
+ }else {
+ bay=bay+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 (bay % 7 == 0) {
bay=bay+1;
}else{
@@ -110,46 +188,13 @@
bay=bay+locMast.getCrnNo()-1;
}
}
- if (row == 3){
- row = row +1;
- } else if (row == 5) {
- row = row+2;
- } else if (row ==8) {
- row = row+3;
- }
- else if (row ==10) {
- row = row+4;
- }
- else if (row ==13) {
- row = row+5;
- }else if (row ==14) {
- row = row+6;
- }else {
- if (row >3){
- row = row +1;
- }
- if (row > 5){
- row = row +1;
- }
- if (row > 8){
- row = row +1;
- }
- if (row > 10){
- row = row +1;
- }
- if (row > 13){
- row = row +1;
- }
- if (row > 14){
- row = row +1;
- }
- }
+ break;
}
- 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