diff --git a/src/main/java/com/dev/swms/server/service/base/LocationStorageManager.java b/src/main/java/com/dev/swms/server/service/base/LocationStorageManager.java
index 43b1f6a..a0023b4 100644
--- a/src/main/java/com/dev/swms/server/service/base/LocationStorageManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/LocationStorageManager.java
@@ -17,6 +17,12 @@ public interface LocationStorageManager extends BaseManager{
 	 */
 	@Transactional
 	void storeLocationStorage(LocationStorage locationStorage);
+	/**
+	 * 批量修改
+	 * @param locationStorage
+	 */
+	@Transactional
+	void storeLocationStorageJh(List<Long> ids,boolean beAuto);
 	
 	/**
 	 * 失效
diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultLocationStorageManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultLocationStorageManager.java
index c7ca188..0886ddb 100644
--- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultLocationStorageManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultLocationStorageManager.java
@@ -143,4 +143,13 @@ public class DefaultLocationStorageManager extends DefaultBaseManager implements
 			}
 		}
 	}
+	@Override
+	public void storeLocationStorageJh(List<Long> ids, boolean beAuto) {
+		// TODO 自动生成的方法存根
+		for (Long id : ids) {
+			LocationStorage locationStorage=this.load(LocationStorage.class, id);
+			locationStorage.setBeAuto(beAuto);
+			commonDao.store(locationStorage);
+		}
+	}
 }
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editLocationStorageJhPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editLocationStorageJhPage.xml
new file mode 100644
index 0000000..f5d6f01
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editLocationStorageJhPage.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editLocationStorageJhPage" title="工作站信息维护"
+		entityClass="com.dev.swms.server.model.base.LocationStorage" width="400"
+		height="310">
+		<inputUIs>
+			<hidden id="ls.id" reserve="false" />
+			<checkbox id="beAuto" title="自动下发"
+					row="9" col="1" defaultValue="false" span="1" readOnly="false"
+					required="false" reserve="false" forceOverride="true" inVisible="false" />
+		</inputUIs>
+		<buttons>
+			<commit id="save" title="save" enableType="none" invisible="false">
+				<mappings>
+					<mapping id="ids" className="list" />
+					<mapping id="beAuto" className="boolean" />
+				</mappings>
+				<actions>
+					<action managerName="locationStorageManager" methodName="storeLocationStorageJh"
+						parameter="ids,beAuto" />
+				</actions>
+				<forwards>
+					<forward name="refreshParent" newEnabled="true"
+						editEnabled="true" />
+					<forward name="closeWindow" newEnabled="true" editEnabled="true" />
+					<forward name="resetWindow" newEnabled="true" editEnabled="false" />
+				</forwards>
+			</commit>
+		</buttons>
+	</editPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml
new file mode 100644
index 0000000..fd847fa
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<maintainPage id="maintainLocationStorageJhPage" title="工作站信息"
+		autoQuery="false">
+		<search>
+			<inputUIs>
+				<text id="ls.code" title="地标码" row="1" col="1" readOnly="false"
+					required="false" reserve="false" forceOverride="false" inVisible="false"
+					trimSpace="false" />
+				<text id="ls.name" title="ls.name" row="1" col="2" readOnly="false"
+					required="false" reserve="false" forceOverride="false" inVisible="false"
+					trimSpace="false" />
+				<list id="ls.warehouseArea.id" title="所属库区" row="2" col="1"
+					span="1" width="120" readOnly="false" required="false" reserve="false"
+					forceOverride="true">
+					<hql><![CDATA[select
+ warehouseArea.id,
+ warehouseArea.name
+ from WarehouseArea warehouseArea
+ where 1=1 and warehouseArea.warehouse = #{SESSION_WAREHOUSE}
+ and warehouseArea.disabled = false  ]]></hql>
+				</list>
+				<list id="ls.sqType" title="深浅类型" row="2" col="2"
+					span="1" width="120" readOnly="false" required="false" reserve="false"
+					forceOverride="true" enumType="SqType">
+					<hql><![CDATA[ SELECT 
+ enumerate.enumValue,
+ enumerate.enumValue From Enumerate enumerate 
+ where enumerate.enumType = 'SqType']]></hql>
+				</list>
+				<list id="ls.gdType" title="尺寸类型" row="3" col="1"
+					span="1" width="120" readOnly="false" required="false" reserve="false"
+					forceOverride="true" enumType="GdType">
+					<hql><![CDATA[ SELECT 
+ enumerate.enumValue,
+ enumerate.enumValue From Enumerate enumerate 
+ where enumerate.enumType = 'GdType']]></hql>
+				</list>
+				<list id="ls.status" title="状态" row="3" col="1"
+					span="1" width="120" readOnly="false" required="false" reserve="false"
+					forceOverride="true" enumType="WarehouseAreaStatus">
+					<hql><![CDATA[ SELECT 
+ enumerate.enumValue,
+ enumerate.enumValue From Enumerate enumerate 
+ where enumerate.enumType = 'WarehouseAreaStatus']]></hql>
+				</list>
+				<text id="ls.agvZone" title="区域" row="4" col="1" readOnly="false"
+					required="false" reserve="false" forceOverride="false" inVisible="false"
+					trimSpace="false" />
+				<checkbox id="ls.disabled" title="00030D3C97851197274983400"
+					row="5" col="2" defaultValue="false" span="1" readOnly="false"
+					required="false" reserve="false" forceOverride="true" inVisible="false" />
+					
+			</inputUIs>
+		</search>
+		<datasource type="hql"><![CDATA[ select 
+ ls.id, 
+ ls.code,
+ ls.name, 
+ ls.warehouseArea.name,
+ ls.type,
+ ls.status,
+ ls.sqType,
+ ls.gdType,
+ ls.rdType,
+ ls.description,
+ worker3.code,
+ ls.currentTask ,
+ ls.unfinishedTask,
+ '0',
+ ls.relevanceCode,
+ ls.length,
+ ls.width,
+ ls.height,
+ ls.outLocation,
+ ls.outLocationFlag,
+ ls.inLocation,
+ ls.inLocationFlag,
+ ls.gzzCode,
+ ls.connectionPort,
+ ls.agvZone,
+ ls.beAuto,
+ ls.disabled
+ from LocationStorage as ls
+ left join ls.warehouseArea as warehouseArea
+ left join ls.worker3 as worker3
+ where 1=1 and ls.type='拣货'
+ /~ls.sqType: and ls.sqType = {ls.sqType}~/
+ /~ls.gdType: and ls.gdType = {ls.gdType}~/
+ /~ls.disabled: and ls.disabled = {ls.disabled}~/
+ /~ls.name: and ls.name like {ls.name}~/
+ /~ls.status: and ls.status like {ls.status}~/
+ /~ls.code: and ls.code like {ls.code}~/
+ /~ls.agvZone: and ls.agvZone like {ls.agvZone}~/
+ /~ls.workstation.id: and ls.workstation.id = {ls.workstation.id}~/
+/~ls.warehouseArea.id: and ls.warehouseArea.id = {ls.warehouseArea.id}~/
+ ]]></datasource>
+		<columns>
+			<column id="ls.id" title="ls.id" visible="false" />
+			<column id="ls.code" title="地标码" visible="true" horizonAlign="center" />
+			<column id="ls.name" title="名称" visible="true" horizonAlign="center" />
+			<column id="ls.zone.name" title="所属库区" visible="true"
+				horizonAlign="center" verticalAlign="middle" />
+			<column id="ls.type" title="类型" visible="true" horizonAlign="center"
+				verticalAlign="middle" />
+			<column id="ls.status" title="状态" visible="true" horizonAlign="center"
+				verticalAlign="middle" dataType="enum" format="enumFormat"
+				formatParam="WarehouseAreaStatus" />
+			
+			<column id="ls.sqType" title="深浅类型" visible="true"
+				horizonAlign="center" verticalAlign="middle" dataType="enum" format="enumFormat"
+				formatParam="SqType"/>
+			<column id="ls.gdType" title="尺寸类型" visible="true"
+				horizonAlign="center" verticalAlign="middle" dataType="enum" format="enumFormat"
+				formatParam="GdType"/>
+			<column id="ls.rdType" title="热度类型" visible="true"
+				horizonAlign="center" verticalAlign="middle" dataType="enum" format="enumFormat"
+				formatParam="RdType"/>
+			<column id="ls.description" title="备注" visible="true"
+				horizonAlign="center" verticalAlign="middle" />
+			<column id="worker3.code" title="作业人员" visible="true"
+				horizonAlign="center" verticalAlign="middle" />
+			<!-- <column id="people" title="工作站人员" visible="true" horizonAlign="center" /> -->
+			<column id="current_task" title="当前任务" visible="true" horizonAlign="center" />
+			<column id="unfinished_task" title="未完成任务" visible="true" horizonAlign="center" />
+			<column id="workload" title="已完成任务" visible="true" horizonAlign="center" />
+			<column id="relevanceCode" title="关联库位" visible="true" horizonAlign="center" />
+			<column id="ls.length" title="长" visible="true" horizonAlign="center" />
+			<column id="ls.width" title="宽" visible="true" horizonAlign="center" />
+			<column id="ls.height" title="高" visible="true" horizonAlign="center" />
+			<column id="ls.outLocation" title="放料库位" visible="true" horizonAlign="center" />
+			<column id="ls.outLocationFlag" title="放料库位状态" visible="true" horizonAlign="center" />
+			<column id="ls.inLocation" title="上料库位" visible="true" horizonAlign="center" />
+			<column id="ls.inLocationFlag" title="上料库位状态" visible="true" horizonAlign="center" />
+			<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" />
+		</columns>
+		<buttons>
+			<popup id="modify" title="批量修改" enableType="multi" invisible="false"
+				containId="false" pageId="editLocationStorageJhPage" />
+			
+		</buttons>
+	</maintainPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index f1d6e5c..5aa2bf7 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -44,6 +44,7 @@
 <!-- 		<menuItem title="menu_maintainLotRulePage" pageId="maintainLotRulePage"/>  -->
         <menuItem title="车牌管理" pageId="maintainPlatePage"/>
         <menuItem title="其他出库协同仓配置" pageId="maintainConfigurationPage"/>
+        <menuItem title="工作站信息" pageId="maintainLocationStorageJhPage"/>
         
         <menuItem title="其他">
 <!--             <menuItem title="料箱管理" pageId="maintainFeedBoxPage"/> -->