#优化地图

whycq

2024-11-25 a1a52e4000a5f2d61031767dc709074fb2f4cdae

#优化地图

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
@@ -60,6 +61,47 @@

        //获取当前楼层库位数据
        List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev,floor);

        if (floor == 1 && lev == 2) {
            List<AgvLocMast> distinctRow = agvLocMastService.selectDistinctLocByLevAndFloor(lev, floor);
            List<Integer> integers = new ArrayList<>();
            int min = 0;
            int i =1;
            for (AgvLocMast locMast : distinctRow) {
                if (min > locMast.getMapRow1()) {
                    min = locMast.getMapRow1();
                }
                if (locMast.getRightSide() == 1) {
                    integers.add(i);
                }
                i++;

            }
            for (AgvLocMast locMast : locMasts) {
                Integer row = locMast.getMapRow1();
                if (row < 0) {
                    row = row - min + 1;
                } else {
                    row = row - min;
                }
                Integer bay = locMast.getMapBay1();
                Integer rightSide = locMast.getRightSide();
                int x = bay;
                int y = row;
                y = generateMap4Row(integers, row);
                ArrayList rowData = arrayLists.get(x);
                Object o = rowData.get(y);

                JSONObject jsonObject = JSON.parseObject(o.toString());
                jsonObject.put("value", "0");

                jsonObject.put("locNo", locMast.getLocNo());//设置库位号
                jsonObject.put("locSts", locMast.getLocSts());//库位状态
                //更新list
                rowData.set(y, jsonObject);
                arrayLists.set(x, rowData);
            }
        } else {
        for (AgvLocMast locMast : locMasts) {
            Integer row = locMast.getRow1();
            Integer bay = locMast.getBay1();
@@ -70,9 +112,6 @@
            //2楼
            if(floor == 1 && lev == 1){
                x = generateMap1Bay(bay);
            }
            if(floor == 1 && lev == 2){
                y = generateMap4Row(row);
            }
            //2楼
            if(floor == 2){
@@ -97,9 +136,11 @@
            rowData.set(y, jsonObject);
            arrayLists.set(x, rowData);
        }
        }

        return JSONObject.toJSONString(arrayLists);
    }

    private Integer generateMap1Bay(int bay){
        int y = bay;
        Integer[] bayAdd = {1,3,5,7,9,11,13,15,17,19};
@@ -113,11 +154,13 @@

    }

    private Integer generateMap4Row(int row){
    private Integer generateMap4Row(List<Integer> rightSide, int row) {
        int x = row;
        Integer[] rowAdd = {1,3,5,7,9,11,13,15,17,19,21};
        for(int i=0; i<rowAdd.length; i++){
            if(row > rowAdd[i]){
//        if (rightSide == 0) {
//            x++;
//        }
        for (int i = 0; i < rightSide.size(); i++) {
            if (row > rightSide.get(i)) {
                x ++;
            }
        }

 src/main/java/com/zy/asrs/entity/AgvLocMast.java

@@ -185,6 +185,21 @@
    @ApiModelProperty(value= "")
    private String status;

    /**
     * 排
     */
    @ApiModelProperty(value= "地图排")
    private Integer mapRow1;

    /**
     * 列
     */
    @ApiModelProperty(value= "地图列")
    private Integer mapBay1;

    @ApiModelProperty(value= "地图列")
    private Integer rightSide;


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);

 src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java

@@ -33,4 +33,8 @@

    @Select("SELECT loc_type2 FROM agv_loc_mast WHERE loc_type1 = #{locType1} AND loc_type2 IS NOT NULL GROUP BY loc_type2")
    List<String> queryContainerTypeByLocType1(@Param("locType1")Short locType1);


    @Select("SELECT distinct map_row1 as mapRow1,right_side as rightSide FROM agv_loc_mast WHERE lev1 = #{lev1} And floor = #{floor} order by map_row1")
    List<AgvLocMast> selectDistinctLocByLevAndFloor(@Param("lev1")Integer lev1,@Param("floor")Integer floor);
}

 src/main/java/com/zy/asrs/service/AgvLocMastService.java

@@ -33,4 +33,6 @@

    public List<String> queryContainerTypeByLocType1(Short locType1);

    List<AgvLocMast> selectDistinctLocByLevAndFloor(int lev, int floor);

}

 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java

@@ -414,4 +414,10 @@
        return this.baseMapper.queryContainerTypeByLocType1(locType1);
    }

    @Override
    public List<AgvLocMast> selectDistinctLocByLevAndFloor(int lev, int floor) {

        return this.agvLocMastMapper.selectDistinctLocByLevAndFloor(lev,floor);
    }

}

 src/main/webapp/views/agvLocMast/locMast_detail.html

@@ -113,6 +113,24 @@
                <input id="floor" class="layui-input" type="text" autocomplete="off" disabled="disabled">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">地图排：</label>
            <div class="layui-input-inline">
                <input id="mapRow1" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">地图列：</label>
            <div class="layui-input-inline">
                <input id="mapBay1" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">侧边过道：</label>
            <div class="layui-input-inline">
                <input id="rightSide" class="layui-input" type="text" autocomplete="off" >
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;display: none">
            <label class="layui-form-label">满　　板：</label>
            <div class="layui-input-inline" style="text-align: left">