#

Junjie

1 天以前 f97c8c0c36f81028de156c861b73d73428a1f415

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

@@ -192,17 +192,18 @@
                        HashMap<String, Object> nodeData = new HashMap<>();
                        nodeData.put("value", map.get("value"));

                        String nodeType = map.get("bgColor").toString();
                        if (nodeType.equals("RGB(0,176,80)")) {
                        String bgColor = map.get("bgColor").toString();
                        String nodeType = map.get("nodeType").toString();
                        if (nodeType.equals("shelf")) {
                            //货架
                            nodeData.put("type", "shelf");
                        } else if (nodeType.equals("RGB(255,192,0)")) {
                        } else if (nodeType.equals("crn")) {
                            //堆垛机
                            nodeData.put("type", "crn");
                        } else if (nodeType.equals("RGB(255,255,0)")) {
                        } else if (nodeType.equals("dualCrn")) {
                            //双工位堆垛机
                            nodeData.put("type", "dualCrn");
                        } else if (nodeType.equals("RGB(0,112,192)")) {
                        } else if (nodeType.equals("devp")) {
                            //输送线
                            nodeData.put("type", "devp");

@@ -266,7 +267,7 @@
                                runBlockReassignStationList.add(stationObjModel);
                                runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
                            }
                        } else if (nodeType.equals("RGB(0,176,240)")) {
                        } else if (nodeType.equals("rgv")) {
                            //RGV
                            nodeData.put("type", "rgv");
                        } else if (nodeType.equals("none")) {
@@ -275,6 +276,7 @@
                        } else if (nodeType.equals("merge")) {
                            //合并区域
                            nodeData.put("type", "merge");
                            nodeData.put("mergeType", map.get("mergeType"));
                        }

                        nodeData.put("cellWidth", map.get("cellWidth"));