From 8a1c1d170ef812d2424be61ad3b22cbc655aaebc Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 三月 2024 08:29:48 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/home/agvMap.html                            |    5 +++--
 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java |    8 ++++----
 src/main/java/com/zy/asrs/controller/AgvMapController.java        |    8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 0fb729b..12caa0b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -58,14 +58,14 @@
         List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev,floor);
         for (AgvLocMast locMast : locMasts) {
             Integer row = locMast.getRow1();
-            Integer bay = locMast.getBay1();
+            Integer bay = 34 - locMast.getBay1();
 
 
             int x = bay;
             int y = row;
             ////1妤�
             //if(floor == 1){
-            //    x = generateMap1Row(row);
+                x = generateMap1Row(row);
             //    y = generateMap1Bay(bay);
             //}
             ////3妤�
@@ -74,8 +74,8 @@
             //    x = generateMap3Bay(bay);
             //}
 
-            ArrayList rowData = arrayLists.get(y);
-            Object o = rowData.get(x);
+            ArrayList rowData = arrayLists.get(x);
+            Object o = rowData.get(y);
 
             JSONObject jsonObject = JSON.parseObject(o.toString());
             jsonObject.put("value","0");
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index dd8095c..e9ed33b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -27,7 +27,7 @@
 
     public void initLocFloor1() {
         //1妤� 13鎺� 86鍒� 12灞�
-        List<AgvLocMast> agvLocMastList = getLocMastList(1,33,1,45,1,1,1);
+        List<AgvLocMast> agvLocMastList = getLocMastList(1,45,1,33,1,1,1);
         this.insertBatch(agvLocMastList);
     }
 
@@ -120,15 +120,15 @@
                     return false;
                 }
             } else if (row == 6) {
-                if (bay < 20 || bay == 25 || bay == 30) {
+                if (bay < 20 || bay == 26 || bay == 30) {
                     return false;
                 }
             } else if (row == 7) {
-                if (bay < 4 || bay == 25) {
+                if (bay < 4 || bay == 26) {
                     return false;
                 }
             } else if (row == 9 || row ==10 ) {
-                if (bay < 4 || bay == 12 || bay == 25) {
+                if (bay < 4 || bay == 12 || bay == 26) {
                     return false;
                 }
             } else if (row == 12) {
diff --git a/src/main/webapp/views/home/agvMap.html b/src/main/webapp/views/home/agvMap.html
index e705dcc..6258351 100644
--- a/src/main/webapp/views/home/agvMap.html
+++ b/src/main/webapp/views/home/agvMap.html
@@ -747,10 +747,11 @@
                 //鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
                 let data = this.map
                 let rowData = data[x]
-                for (var i = 1; i < rowData.length; i++) {
+                for (var i = 0; i < rowData.length; i++) {
                     if (rowData[i].locNo != undefined) {
                         let locNo = rowData[i].locNo;
-                        return "#" + parseInt(locNo.substr(0, 2));
+                        //return "#" + parseInt(locNo.substr(0, 2));
+                        return "#" + (x < 10 ? '0' + x : x);
                     }
                 }
 

--
Gitblit v1.9.1