Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

zyx

2024-03-21 c253255495465d4406fcaddeb7be40d15fce290a

 src/main/java/com/zy/asrs/controller/AgvMapController.java

@@ -58,21 +58,21 @@
        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);
                y = generateMap1Bay(bay);
            }
            //3楼
            if(floor == 3){
                y = generateMap3Row(row);
                x = generateMap3Bay(bay);
            }
            ////1楼
            //if(floor == 1){
            //    x = generateMap1Row(row);
            //    y = generateMap1Bay(bay);
            //}
            ////3楼
            //if(floor == 3){
            //    y = generateMap3Row(row);
            //    x = generateMap3Bay(bay);
            //}

            ArrayList rowData = arrayLists.get(x);
            Object o = rowData.get(y);