#

Junjie

3 天以前 6d99081f3f6e0363b0bd28053e545a8e4589b979

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

@@ -198,6 +198,9 @@
                    }else if (nodeType.equals("RGB(255,192,0)")) {
                        //堆垛机
                        nodeData.put("type", "crn");
                    }else if (nodeType.equals("RGB(255,255,0)")) {
                        //双工位堆垛机
                        nodeData.put("type", "dualCrn");
                    }else if (nodeType.equals("RGB(0,112,192)")) {
                        //输送线
                        nodeData.put("type", "devp");
@@ -215,8 +218,21 @@

                        Integer isBarcodeStation = value.getInteger("isBarcodeStation");
                        if (isBarcodeStation != null && isBarcodeStation == 1) {
                            StationObjModel barcodeStationModel = new StationObjModel();
                            barcodeStationModel.setDeviceNo(deviceNo);
                            barcodeStationModel.setStationId(value.getInteger("stationId"));
                            barcodeStationModel.setBarcodeIdx(value.getInteger("barcodeIdx"));

                            if (value.getInteger("backStation") != null) {
                                StationObjModel backStation = new StationObjModel();
                                barcodeStationModel.setBackStation(backStation);

                                backStation.setDeviceNo(value.getInteger("backStationDeviceNo"));
                                backStation.setStationId(value.getInteger("backStation"));
                            }

                            List<StationObjModel> barcodeStationList = barcodeStationMap.getOrDefault(deviceNo, new ArrayList<>());
                            barcodeStationList.add(stationObjModel);
                            barcodeStationList.add(barcodeStationModel);
                            barcodeStationMap.put(deviceNo, barcodeStationList);
                        }