#

Junjie

2025-11-14 b348fde3d49e7d15b3705c8653883833a2e26697

#

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

@@ -201,7 +201,6 @@
        if (basMap == null){
            basMap = new BasMap();
        }
        basMap.setLev(1);
        basMap.setData(JSON.toJSONString(dataList));
        basMap.setOriginData(JSON.toJSONString(dataList));
        basMap.setCreateTime(new Date());

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -15,7 +16,11 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
import com.zy.common.web.BaseController;
import com.zy.core.enums.MapNodeType;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -135,13 +140,63 @@
    @PostMapping("/locMast/init")
    @ManagerAuth(memo = "初始化库位")
    @Transactional
    public R locMastInit() {
    public R locMastInit(@RequestParam Integer lev) {
        BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
        if (Cools.isEmpty(basMap)){
            return R.error("请先初始化地图");
        }
        List<List<JSONObject>> dataList = JSON.parseObject(basMap.getData(), List.class);

        List<HashMap<String, Object>> locNoList = new ArrayList<>();
        
        int initRow = 1;
        for (int i = 0; i < dataList.size(); i++) {
            List<JSONObject> row = dataList.get(i);
            
            int initBay = -1;
            for (int j = 0; j < row.size(); j++) {
                JSONObject map = row.get(j);

                String nodeType = map.getString("type");
                if("shelf".equals(nodeType)) {
                    if(initBay == -1) {
                        initBay = 1;
                    }

                    HashMap<String, Object> locNoMap = new HashMap<>();
                    locNoMap.put("row", initRow);
                    locNoMap.put("bay", initBay);
                    locNoMap.put("mapX", i);
                    locNoMap.put("mapY", j);
                    locNoList.add(locNoMap);
                    initBay++;
                }else {
                    continue;
                }
            }

            if(initBay != -1) {
                initRow++;
            }
        }
        
        locMastService.delete(new EntityWrapper<LocMast>());

        for (int i = 1; i <= lev; i++) {
            int finalLev = i;
            locNoList.forEach(map -> {
                LocMast locMast = new LocMast();
                int row = (int) map.get("row");
                int bay = (int) map.get("bay");
                locMast.setLocNo(Utils.getLocNo(row, bay, finalLev));
                locMast.setRow1(row);
                locMast.setBay1(bay);
                locMast.setLev1(finalLev);
                locMast.setStatus(1);
                locMast.setAppeTime(new Date());
                locMastService.insert(locMast);
            });
        }

        return R.ok();
    }

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

@@ -6,8 +6,6 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 src/main/resources/mapper/BasMapMapper.xml

@@ -26,9 +26,4 @@
        limit 0,1
    </select>

    <delete id="deleteByLev">
        delete from asr_bas_map
        where lev = #{lev}
    </delete>

</mapper>

 src/main/webapp/static/js/basMap/basMap.js

@@ -164,19 +164,18 @@
    });

    function initLocMast() {
        layer.confirm('确定初始化库位数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
        layer.prompt({title: '请输入初始化库位层数', formType: 0,   shadeClose: true}, function(lev, idx){
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl + "/locMast/init",
                headers: {'token': localStorage.getItem('token')},
                data: {},
                data: {
                    'lev': lev
                },
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    layer.close(idx);
                    if (res.code === 200) {
                        layer.msg(res.msg, {icon: 1});
                        tableReload();