From 690dd92493026305c7aa12dfe34251e008317ac4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 六月 2023 14:47:47 +0800
Subject: [PATCH] #平库地图完成
---
src/main/java/com/zy/asrs/controller/MapController.java | 43 ++++++++++++++
src/main/webapp/views/home/map.html | 53 ++++++++++++++---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 20 ++++++
src/main/resources/mapper/LocMastMapper.xml | 12 ++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 7 ++
src/main/java/com/zy/asrs/service/LocMastService.java | 5 +
src/main/resources/DTBnode.json | 1
src/main/webapp/static/js/orderCheck/orderCheck.js | 3
8 files changed, 133 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 3eb373d..7c47302 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/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,19 @@
mapFilename = "DTDnode.json";
locMasts = locMastService.selectNodeDLocByLev(lev);
break;
+ case 32:
+ mapFilename = "DTBnode.json";
+ locMasts = locMastService.selectNodeB2LocByLev(lev);
+ break;
+ case 42:
+ mapFilename = "DTCnode.json";
+ locMasts = locMastService.selectNodeC2LocByLev(lev);
+ break;
+ case 52:
+ mapFilename = "DTDnode.json";
+ locMasts = locMastService.selectNodeD2LocByLev(lev);
+ break;
+
}
String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
// File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
@@ -102,8 +118,35 @@
break;
case 2:
case 3:
+ case 32:
+ 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 (bay % 6 == 0) {
+ bay=bay+1;
+ }else{
+ if (bay>6){
+ bay=bay+locMast.getCrnNo();
+ }else {
+ bay=bay+locMast.getCrnNo()-1;
+ }
+ }
+ break;
case 4:
case 5:
+ case 42:
+ case 52:
if (row<=11){
if (row%2==0){
row=row+(row/2)-1;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index dbd54c5..18b2631 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -30,4 +30,11 @@
List<LocMast> selectNodeDByLev(Integer lev);
List<LocMast> selectNodeCByLev(Integer lev);
+
+ List<LocMast> selectNodeBByLev(Integer lev);
+ List<LocMast> selectNodeD2ByLev(Integer lev);
+
+ List<LocMast> selectNodeC2ByLev(Integer lev);
+
+ List<LocMast> selectNodeB2ByLev(Integer lev);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 0d7e566..3a9988e 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -42,6 +42,11 @@
List<LocMast> selectLocByLev(Integer lev);
List<LocMast> selectNodeDLocByLev(Integer lev);
List<LocMast> selectNodeCLocByLev(Integer lev);
+ List<LocMast> selectNodeBLocByLev(Integer lev);
+
+ List<LocMast> selectNodeD2LocByLev(Integer lev);
+ List<LocMast> selectNodeC2LocByLev(Integer lev);
+ List<LocMast> selectNodeB2LocByLev(Integer lev);
List<LocMast> selectByLocNo(List<String> locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ff7d3d7..53d95a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -69,6 +69,26 @@
}
@Override
+ public List<LocMast> selectNodeBLocByLev(Integer lev) {
+ return this.baseMapper.selectNodeBByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectNodeD2LocByLev(Integer lev) {
+ return this.baseMapper.selectNodeD2ByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectNodeC2LocByLev(Integer lev) {
+ return this.baseMapper.selectNodeC2ByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectNodeB2LocByLev(Integer lev) {
+ return this.baseMapper.selectNodeB2ByLev(lev);
+ }
+
+ @Override
public List<LocMast> selectByLocNo(List<String> locNo) {
return this.baseMapper.selectByLocNo(locNo);
}
diff --git a/src/main/resources/DTBnode.json b/src/main/resources/DTBnode.json
new file mode 100644
index 0000000..80b54a4
--- /dev/null
+++ b/src/main/resources/DTBnode.json
@@ -0,0 +1 @@
+[[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":6},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":7},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":8},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":9},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":10},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":10},{"value":-16,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":10},{"value":-15,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":10},{"value":-14,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":10},{"value":-13,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":10},{"value":-12,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":10},{"value":-11,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":10},{"value":-10,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":10},{"value":-9,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":10},{"value":-8,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":10},{"value":-7,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":10},{"value":-6,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":10},{"value":-5,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":10},{"value":-4,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":10},{"value":-3,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":10},{"value":-2,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":5},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":6},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":7},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":8},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":9},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":10},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":11}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":6},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":7},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":8},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":9},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":10},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":11}]]
\ No newline at end of file
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 663359b..201ee54 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -92,4 +92,16 @@
<select id="selectNodeCByLev" resultMap="BaseResultMap">
SELECT * FROM asr_node_loc_DT_C_view WHERE lev1 = #{lev}
</select>
+ <select id="selectNodeBByLev" resultMap="BaseResultMap">
+ SELECT * FROM asr_node_loc_DT_B_view WHERE lev1 = #{lev}
+ </select>
+ <select id="selectNodeD2ByLev" resultMap="BaseResultMap">
+ SELECT * FROM asr_node_loc_DT_D2_view WHERE lev1 = #{lev}
+ </select>
+ <select id="selectNodeC2ByLev" resultMap="BaseResultMap">
+ SELECT * FROM asr_node_loc_DT_C2_view WHERE lev1 = #{lev}
+ </select>
+ <select id="selectNodeB2ByLev" resultMap="BaseResultMap">
+ SELECT * FROM asr_node_loc_DT_B2_view WHERE lev1 = #{lev}
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index 22bd667..29fc78f 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -772,7 +772,8 @@
// window.open("http://localhost:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo);
layer.closeAll();
layer.load(1, {shade: [0.1,'#fff']});
- location.href = "http://localhost:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ location.href = "http://47.97.1.152:58080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
layer.closeAll('loading');
});
}
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 13a6764..49ffc1e 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -217,7 +217,7 @@
/*婊戝姩鍗＄墖start*/
.hoverCard {
- width: 140px;
+ width: 152px;
height: 224px;
border-radius: 20px;
background: #f5f5f5;
@@ -481,7 +481,7 @@
<div style="width: 100%;margin-bottom: 20px;">
<div style="display: flex;justify-content: space-between;">
<div><input v-model="searchMatnr" placeholder="鐗╂枡鍙�" type="text" class="search-input"></div>
- <div><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
+ <div style="margin-left: 20px"><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
</div>
<div style="display: flex;justify-content: space-between;margin-top: 10px;">
<div><input style="width: 110px;" v-model="searchMaktx" placeholder="鐗╂枡鍚嶇О" type="text" class="search-input"></div>
@@ -549,24 +549,28 @@
<div class="hoverCard">
<div class="card-details">
- <p class="text-title" style="text-align: center;">搴撳尯 {{area}}</p>
+ <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>
<div class="text-body" style="display: flex;">
<div class="floorSelect">
<label for="area01">绔嬪簱</label>
<input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
- <label for="area02">骞冲簱A鍖�</label>
- <input id="area02" type="radio" v-model="area" name="r" value="2">
<label for="area03">骞冲簱B鍖�</label>
<input id="area03" type="radio" v-model="area" name="r" value="3">
+ <label for="area032">骞冲簱B鍖�2灞�</label>
+ <input id="area032" type="radio" v-model="area" name="r" value="32">
<label for="area04">骞冲簱C鍖�</label>
<input id="area04" type="radio" v-model="area" name="r" value="4">
+ <label for="area042">骞冲簱C鍖�2灞�</label>
+ <input id="area042" type="radio" v-model="area" name="r" value="42">
<label for="area05">骞冲簱D鍖�</label>
<input id="area05" type="radio" v-model="area" name="r" value="5">
+ <label for="area052">骞冲簱D鍖�2灞�</label>
+ <input id="area052" type="radio" v-model="area" name="r" value="52">
</div>
</div>
</div>
- <button class="card-button">搴撳尯 {{area}}</button>
+ <button class="card-button">搴撳尯 {{areaName}}</button>
</div>
<div class="hoverCard">
@@ -690,6 +694,7 @@
pointContainerWidth: 0,
currentLev: 1,
area:1,
+ areaName:"绔嬪簱",
crnList: null,
crnBox: false,
crnBoxTop: "0px",
@@ -750,6 +755,29 @@
area: {
deep: true,
handler(val) {
+ if (val == 1){
+ this.areaName = "绔嬪簱"
+
+ }else if (val == 3){
+ this.areaName = "B鍖�"
+ }
+ else if (val == 4){
+ this.areaName = "C鍖�"
+ }
+ else if (val == 5){
+ this.areaName = "D鍖�"
+ }
+ else if (val == 32){
+ this.areaName = "B鍖�2灞�"
+ }
+ else if (val == 42){
+ this.areaName = "C鍖�2灞�"
+ }
+ else if (val == 52){
+ this.areaName = "D鍖�2灞�"
+ }
+
+
this.init()
if (this.searchMatnr != ""
|| this.searchOrderNo != ""
@@ -773,7 +801,6 @@
headers: {'token': localStorage.getItem('token')},
method: "get",
success: (data) => {
- console.log(data)
that.importDataClick(data)
}
})
@@ -813,7 +840,7 @@
//鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
let data = this.map
let rowData = data[x]
- console.log(x)
+
for (var i = 1; i < rowData.length; i++) {
@@ -822,10 +849,16 @@
let locNo = rowData[i].locNo;
return "#" + parseInt(locNo.substr(0, 2));
}
- }else {
+ }else if (this.area > 10){
if (rowData[i].locNo != undefined) {
let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(7, 2));;
+ return "#" + parseInt(locNo.substr(8, 2));
+ }
+ }
+ else {
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(7, 2));
}
}
--
Gitblit v1.9.1