#

zyx

2024-04-07 7ad79ee463adbdbc51e37c12ae025fb8598ab670

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

@@ -11,7 +11,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.*;

import java.io.*;
@@ -31,14 +30,18 @@

    }};

    @GetMapping("/map/getData/{lev}/auth")
    @GetMapping("/map/getData/auth")
    @ManagerAuth
    public String getMapData(@PathVariable("lev") Integer lev) {
    public String getMapData(@RequestParam Integer lev,@RequestParam Integer area) {
        try {
//            String mapFilename = "map.json";
            String mapFilename = "map.json";
//            String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
//            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//获取文件路径
            File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
            //获取当前楼层库位数据
            List<LocMast> locMasts = locMastService.selectNodeLocByLev(lev);

            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//获取文件路径
//            File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
            File file = new File(fileName);
            StringBuffer stringBuffer = new StringBuffer();
            if (file.isFile() && file.exists()) {
                InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -68,29 +71,23 @@
                    arrayLists.set(row, rowData);
                }

                //获取当前楼层库位数据
                List<LocMast> locMasts = locMastService.selectLocByLev(lev);


                for (LocMast locMast : locMasts) {

                    Integer row = locMast.getRow1();
                    Integer bay = locMast.getBay1();
                    if (row<17){
                        if (row % 4 == 0 || (row+1) % 4 == 0) {
                            row=row+locMast.getCrnNo();
                        }else{
                            row=row+locMast.getCrnNo()-1;
                        }
                    }else {
                        row=row-100+21;
                    }

                    ArrayList rowData = arrayLists.get(row);
                    Object o = rowData.get(bay);
                    JSONObject jsonObject = JSON.parseObject(o.toString());
                    jsonObject.put("locNo", locMast.getLocNo());//设置库位号
                    jsonObject.put("locSts", locMast.getLocSts());//库位状态
                    jsonObject.put("locSts$", locMast.getLocSts$());//库位状态
                    //jsonObject.put("locSts$", locMast.getLocSts$());//库位状态
                    //更新list
                    rowData.set(bay, jsonObject);
                    arrayLists.set(row, rowData);

                }

                return JSONObject.toJSONString(arrayLists);
@@ -112,7 +109,7 @@
                       @RequestParam("matnr") String matnr,
                       @RequestParam("maktx") String maktx
    ) {
        List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, locNo);
        List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, "");
        ArrayList<LocDetl> lists = new ArrayList<>();
        for (LocDetl locDetl : locDetls) {//过滤掉不是当前楼层的数据
            int lev1 = Utils.getLev(locDetl.getLocNo());
@@ -120,6 +117,14 @@
                lists.add(locDetl);
            }
        }

        //搜索指定库位号，即使库位为空，也可以返回数据
        LocMast locMast = locMastService.selectById(locNo);
        if (locMast != null) {
            LocDetl locDetl = new LocDetl();
            locDetl.setLocNo(locMast.getLocNo());
            lists.add(locDetl);
        }
        return R.ok().add(lists);
    }