From 92322eeef7bd59a41f4b41ec6f0d5acf39c2f9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Mon, 6 Jan 2025 17:52:07 +0800
Subject: [PATCH] no message

---
 .../com/dev/swms/server/model/base/LocationStorage.java  | 9 +++++++++
 .../dev/swms/server/model/base/locationStorage.hbm.xml   | 1 +
 .../config/origen/base/maintainLocationStoragePage.xml   | 4 ++++
 3 files changed, 14 insertions(+)

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 @@
 		<property name="dimension" column="DIMENSION" type="double" />
 		<property name="connectionPort" column="connection_Port" type="string" length="50" />
 		<property name="agvZone" column="agv_Zone" type="string" length="50" />
+		<property name="beAuto" column="be_auto" type="boolean" length="50" />
 	</class>
 </hibernate-mapping>
\ 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 @@
 			<column id="ls.gzzCode" title="工作站编号" visible="true" horizonAlign="center" />
 			<column id="ls.connectionPort" title="到站编号" visible="true" horizonAlign="center" />
 			<column id="ls.agvZone" title="AGV库区" visible="true" horizonAlign="center" />
+			<column id="ls.beAuto" title="自动下发" visible="true"
+				horizonAlign="center" verticalAlign="middle" format="booleanFormat"
+				formatParam="beAuto" />
 			<column id="ls.disabled" title="是否失效" visible="true"
 				horizonAlign="center" verticalAlign="middle" format="booleanFormat"
 				formatParam="disabled" />