#货主转换搜索无数据优化

LSH

2023-07-18 a4cdd4d37761c06ad89d9c42a00402f63f811f35

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

@@ -31,12 +31,37 @@

    }};

    @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 fileName ="file:" + new ClassPathResource(mapFilename).getPath();
            //获取当前楼层库位数据
            List<LocMast> locMasts = locMastService.selectLocByLev(lev);
            switch (area){
                case 1:
                    break;
                case 2:
                case 3:
                    mapFilename = "DTBnode.json";
                    locMasts = locMastService.selectNodeBLocByLev(lev);
                    break;
                case 4:
                    mapFilename = "DTCnode.json";
                    locMasts = locMastService.selectNodeCLocByLev(lev);
                    break;
                case 5:
                    mapFilename = "DTDnode.json";
                    locMasts = locMastService.selectNodeDLocByLev(lev);
                    break;
                case 6:
                    mapFilename = "DTEnode.json";
                    locMasts = locMastService.selectNodeELocByLev(lev);
                    break;


            }
            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);
@@ -69,29 +94,142 @@
                    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;

                    switch (area){
                        case 1:
                            if (row % 4 == 0 || (row+1) % 4 == 0) {
                                row=row+locMast.getCrnNo();
                            }else{
                                row=row+locMast.getCrnNo()-1;
                            }
                            bay=32-bay;
                            break;
                        case 2:
                        case 3:
//                            if (row<=3 || row>=5){
//                                if (row%1==0){
//                                    row=row+(row/1)-1;
//                                }else {
//                                    row=row+((row+1)/1)-1;
//                                }
//                            }else {
//                                if (row%2==0){
//                                    row=row+(row/2);
//                                }else {
//                                    row=row+((row-1)/2);
//                                }
//                            }
//                            if (row == 9){
//                                row= row -1;
//                            }

                            if (row ==7) {
                                row=row+2;
                            }else{
                                if (row>7){
                                    row=row+locMast.getCrnNo()+1;
                                }else {
                                    row=row+locMast.getCrnNo()-1;
                                }
                            }
                            break;
                        case 4:
//                            if (row<=11){
////                                if (row%2==0){
////                                    row=row+(row/2)-1;
////                                }else {
////                                    row=row+((row+1)/2)-1;
////                                }
////                            }else {
////                                if (row%2==0){
////                                    row=row+(row/2);
////                                }else {
////                                    row=row+((row-1)/2);
////                                }
////                            }

                            if (row % 10 == 0) {
                                row=row+2;
                            }else{
                                if (row>10){
                                    row=row+locMast.getCrnNo()+1;
                                }else {
                                    row=row+locMast.getCrnNo()-1;
                                }
                            }
                            break;
                        case 5:
//                            if (row<=11){
//                                if (row%2==0){
//                                    row=row+(row/2)-1;
//                                }else {
//                                    row=row+((row+1)/2)-1;
//                                }
//                            }else {
//                                if (row%2==0){
//                                    row=row+(row/2);
//                                }else {
//                                    row=row+((row-1)/2);
//                                }
//                            }

                            if (row % 7 == 0) {
                                row=row+2;
                            }else{
                                if (row>7){
                                    row=row+locMast.getCrnNo()+1;
                                }else {
                                    row=row+locMast.getCrnNo()-1;
                                }
                            }
                            break;



                    }

                    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);



//                    if (area == 1 || area == 6){
//                        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$());//库位状态
//                        //更新list
//                        rowData.set(bay, jsonObject);
//                        arrayLists.set(row, rowData);
//                    }else {
//                        ArrayList rowData = arrayLists.get(bay);
//                        Object o = rowData.get(row);
//                        JSONObject jsonObject = JSON.parseObject(o.toString());
//                        jsonObject.put("locNo", locMast.getLocNo());//设置库位号
//                        jsonObject.put("locSts", locMast.getLocSts());//库位状态
//                        //jsonObject.put("locSts$", locMast.getLocSts$());//库位状态
//                        //更新list
//                        rowData.set(row, jsonObject);
//                        arrayLists.set(bay, rowData);
//                    }



                }

                return JSONObject.toJSONString(arrayLists);
@@ -113,7 +251,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());
@@ -121,6 +259,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);
    }