diff --git a/src/main/java/com/dev/swms/server/model/base/LocationStorage.java b/src/main/java/com/dev/swms/server/model/base/LocationStorage.java index 76785be..b5d79a3 100644 --- a/src/main/java/com/dev/swms/server/model/base/LocationStorage.java +++ b/src/main/java/com/dev/swms/server/model/base/LocationStorage.java @@ -49,6 +49,7 @@ public class LocationStorage extends Entity{ private String workload;//已完成任务 private String gzzCode;//工作站编号 + private boolean beAuto;//是否自动下发 private String outLocation;//放料库位 private String inLocation;//上料库位 private int inLocationFlag=0;//AGV上料库位状态交互 @@ -80,6 +81,14 @@ public class LocationStorage extends Entity{ + public boolean getBeAuto() { + return beAuto; + } + + public void setBeAuto(boolean beAuto) { + this.beAuto = beAuto; + } + public String getAgvZone() { return agvZone; } diff --git a/src/main/java/com/dev/swms/server/model/base/locationStorage.hbm.xml b/src/main/java/com/dev/swms/server/model/base/locationStorage.hbm.xml index 6081769..b1169f0 100644 --- a/src/main/java/com/dev/swms/server/model/base/locationStorage.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/base/locationStorage.hbm.xml @@ -62,5 +62,6 @@ + \ No newline at end of file diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStoragePage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStoragePage.xml index f933dab..acbac88 100644 --- a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStoragePage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStoragePage.xml @@ -80,6 +80,7 @@ ls.gzzCode, ls.connectionPort, ls.agvZone, + ls.beAuto, ls.disabled from LocationStorage as ls left join ls.warehouseArea as warehouseArea @@ -135,6 +136,9 @@ +