#

zjj

2023-09-22 84334c663dba00af90b4a3ffe86a4d321f8d5deb

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

@@ -44,6 +44,9 @@
                    break;
                case 2:
                case 3:
                    mapFilename = "DTBnode.json";
                    locMasts = locMastService.selectNodeBLocByLev(lev);
                    break;
                case 4:
                    mapFilename = "DTCnode.json";
                    locMasts = locMastService.selectNodeCLocByLev(lev);
@@ -52,6 +55,12 @@
                    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");
@@ -88,6 +97,7 @@


                for (LocMast locMast : locMasts) {

                    Integer row = locMast.getRow1();
                    Integer bay = locMast.getBay1();

@@ -102,29 +112,80 @@
                            break;
                        case 2:
                        case 3:
                        case 4:
                        case 5:
                            if (row<=11){
                                if (row%2==0){
                                    row=row+(row/2)-1;
//                            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+((row+1)/2)-1;
                                }
                            }else {
                                if (row%2==0){
                                    row=row+(row/2);
                                }else {
                                    row=row+((row-1)/2);
                                    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 (bay % 7 == 0) {
                                bay=bay+1;
                            if (row % 10 == 0) {
                                row=row+2;
                            }else{
                                if (bay>7){
                                    bay=bay+locMast.getCrnNo();
                                if (row>10){
                                    row=row+locMast.getCrnNo()+1;
                                }else {
                                    bay=bay+locMast.getCrnNo()-1;
                                    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;
@@ -133,27 +194,39 @@

                    }

                    if (area == 1){
                        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);
                    }
                    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);



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