diff --git a/src/main/java/com/zzjee/md/controller/MdBinController.java b/src/main/java/com/zzjee/md/controller/MdBinController.java
index dfd4e467..7fdf686c 100644
--- a/src/main/java/com/zzjee/md/controller/MdBinController.java
+++ b/src/main/java/com/zzjee/md/controller/MdBinController.java
@@ -227,6 +227,18 @@ public class MdBinController extends BaseController {
jsonParts.put("binid", resultt.get(i).get("binid"));
jsonParts.put("des", resultt.get(i).get("des"));
jsonParts.put("tincount", resultt.get(i).get("tincount"));
+ try{
+ jsonParts.put("xnode", resultt.get(i).get("xnode"));
+
+ jsonParts.put("ynode", resultt.get(i).get("ynode"));
+
+ jsonParts.put("znode", resultt.get(i).get("znode"));
+
+ jsonParts.put("colour", resultt.get(i).get("colour"));
+
+ }catch (Exception e){
+
+ }
result.add(jsonParts);
}
j.setObj(resultt.size());
diff --git a/src/main/java/com/zzjee/md/entity/MdBinEntity.java b/src/main/java/com/zzjee/md/entity/MdBinEntity.java
index deac564f..c5f9c9b1 100644
--- a/src/main/java/com/zzjee/md/entity/MdBinEntity.java
+++ b/src/main/java/com/zzjee/md/entity/MdBinEntity.java
@@ -118,6 +118,12 @@ public class MdBinEntity implements java.io.Serializable {
/**仓库*/
@Excel(name="电子标签ID")
private java.lang.String lorabqId;
+ @Excel(name="X坐标")
+ private java.lang.String xnode;
+ @Excel(name="y坐标")
+ private java.lang.String ynode;
+ @Excel(name="z坐标")
+ private java.lang.String znode;
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@@ -667,4 +673,31 @@ public class MdBinEntity implements java.io.Serializable {
public void setLorabqId(String lorabqId) {
this.lorabqId = lorabqId;
}
+
+ @Column(name ="XNODE",nullable=true,length=32)
+ public String getXnode() {
+ return xnode;
+ }
+
+ public void setXnode(String xnode) {
+ this.xnode = xnode;
+ }
+
+ @Column(name ="YNODE",nullable=true,length=32)
+ public String getYnode() {
+ return ynode;
+ }
+
+ public void setYnode(String ynode) {
+ this.ynode = ynode;
+ }
+
+ @Column(name ="ZNODE",nullable=true,length=32)
+ public String getZnode() {
+ return znode;
+ }
+
+ public void setZnode(String znode) {
+ this.znode = znode;
+ }
}
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
index 2b2d266c..ab2567df 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
@@ -344,6 +344,46 @@
+
+
+
+
+
+ X坐标
+
+
+
+
+
+
+
+
+
+ y坐标
+
+
+
+
+
+
+
+
+
+ z坐标
+
+
+
+
+
+
+
+
+
+
+
+ X坐标
+
+
+
+
+
+
+
+
+
+ y坐标
+
+
+
+
+
+
+
+
+
+ z坐标
+
+
+
+
+
+
+
+
+