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

zyx

2024-03-21 c253255495465d4406fcaddeb7be40d15fce290a

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

@@ -58,7 +58,7 @@
        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;
@@ -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");