From 61d28206585b8746a9f1982cfe1dfc5deabde91a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 17 六月 2023 09:03:27 +0800
Subject: [PATCH] #库存统计更改为包括立库、平库

---
 src/main/java/com/zy/asrs/controller/MapController.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 33b65bc..762d8ad 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -125,18 +125,45 @@
                                     row=row+((row-1)/2);
                                 }
                             }
+                            if (row == 9){
+                                row= row -1;
+                            }
 
-                            if (bay % 6 == 0) {
-                                bay=bay+1;
+                            if (bay ==7) {
+                                bay=bay+2;
                             }else{
-                                if (bay>6){
-                                    bay=bay+locMast.getCrnNo();
+                                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){

--
Gitblit v1.9.1