diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
index 0767e84..fe367f5 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
@@ -58,7 +58,6 @@
  left join location.zone zone 
  where 1=1 and location.type!='SHIP' and location.type!='RECEIVE' 
  /~location.disabled: and location.disabled = {location.disabled}~/
- /~SESSION_WAREHOUSE: and location.warehouse = #{SESSION_WAREHOUSE} ~/
  /~location.code: and location.code like {location.code} ~/
  /~location.type: and location.type = {location.type} ~/
  /~location.rackType: and location.rackType = {location.rackType} ~/
diff --git a/target/jjwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml b/target/jjwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
deleted file mode 100644
index 0767e84..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainLocationPage" title="maintainLocationPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <list id="location.zone.id" title="location.zone" row="1" col="1" span="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="true">
-                    <hql><![CDATA[select
- zone.id,
- zone.name
- from WarehouseArea zone
- where 1=1 and zone.warehouse = #{SESSION_WAREHOUSE}
- and zone.disabled = false order by zone.code]]></hql>
-                </list>
-                <text id="location.code" title="location.code" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <list id="location.type" title="location.type" row="2" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="LocationType">
-                    <hql><![CDATA[SELECT 
- enumerate.enumValue,
- enumerate.enumValue From Enumerate enumerate 
- where enumerate.enumType = 'LocationType'
- ORDER BY enumerate.id]]></hql>
-                </list>
-                <remote id="location.stowage.id" title="location.stowage" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" manualEditable="true" displayedTableHead="序号,编码,名称">
-                    <hql><![CDATA[select stowage.id, stowage.code, stowage.name from Stowage stowage 
- where stowage.warehouse = #{SESSION_WAREHOUSE} and upper(stowage.code) like upper(:param)
- and stowage.disabled=false]]></hql>
-                </remote>
-                <list id="location.rackType" title="location.rackType" row="3" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="RackType">
-                    <hql><![CDATA[SELECT 
- enumerate.enumValue,
- enumerate.enumValue From Enumerate enumerate 
- where enumerate.enumType = 'RackType'
- ORDER BY enumerate.id]]></hql>
-                </list>
-                <text id="location.status" title="location.status" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
-                <checkbox id="location.disabled" title="00030D3C97851197274983400" row="4" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ select location.id, 
- zone.name,
- location.code, 
- location.name, 
- location.type,
- location.stowage.name,
- location.rackType,
- location.mixItem,
- location.mixLot,
- location.sortIndex,
- lv.loc_status,
- location.inLock,
- location.outLock,
- location.countLock,
- location.cycleDate,
- location.disabled
- from LocStatusView lv 
- left join lv.loc location 
- left join location.stowage stowage
- left join location.zone zone 
- where 1=1 and location.type!='SHIP' and location.type!='RECEIVE' 
- /~location.disabled: and location.disabled = {location.disabled}~/
- /~SESSION_WAREHOUSE: and location.warehouse = #{SESSION_WAREHOUSE} ~/
- /~location.code: and location.code like {location.code} ~/
- /~location.type: and location.type = {location.type} ~/
- /~location.rackType: and location.rackType = {location.rackType} ~/
- /~location.status: and location.status like {location.status} ~/
- /~location.zone.id: and zone.id = {location.zone.id} ~/
- /~location.stowage.id: and stowage.id = {location.stowage.id} ~/
- order by location.code,location.id desc]]></datasource>
-        <columns>
-            <column id="location.id" title="location.id" visible="false"/>
-            <column id="location.zone.name" title="location.zone" visible="true" horizonAlign="left"/>
-            <column id="location.code" title="location.code" visible="true" horizonAlign="left"/>
-            <column id="location.name" title="location.name" visible="true" horizonAlign="left"/>
-            <column id="location.type" width="80" title="location.type" visible="true" horizonAlign="left" verticalAlign="middle" format="colourFormat"/>
-            <column id="location.stowage.name" title="location.stowage" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.rackType" title="location.rackType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="RackType"/>
-            <column id="location.mixItem" width="80" title="location.mixItem" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
-            <column id="location.mixLot" width="80" title="location.mixLot" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
-            <column id="location.sortIndex" width="60" title="location.sortIndex" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.status" width="80" title="location.status" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.inLock" width="80" title="location.inLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.outLock" width="80" title="location.outLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.countLock" title="location.countLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.cycleDate" title="location.cycleDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.disabled" title="location.disabled" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="disabled"/>
-        </columns>
-        <buttons>
-            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editLocationPage"/>
-            <popup id="modify" title="edit" enableType="single" invisible="false" containId="true" pageId="editLocationPage">
-                <enableExpression><![CDATA[(${location.disabled}=='false')]]></enableExpression>
-            </popup>
-            <commit id="inAction" title="inAction" enableType="multi" invisible="false" confirmMessage="maintainLocationPage.confirm.inAction">
-                <enableExpression><![CDATA[(${location.disabled}=='false')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="locationManager" methodName="deleteAll" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="active" title="00030D3C97851197275111894" enableType="multi" invisible="false">
-                <enableExpression><![CDATA[(${location.disabled}=='true')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="locationManager" methodName="active" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
-                </forwards>
-            </commit>
-            <popup id="lock" title="lock" enableType="multi" invisible="false" containId="false" pageId="lockLocationPage">
-                <enableExpression><![CDATA[(${location.inLock} == '-') || (${location.outLock} == '-')]]></enableExpression>
-            </popup>
-            <popup id="unlock" title="unlock" enableType="multi" invisible="false" containId="false" pageId="unlockLocationPage">
-                <enableExpression><![CDATA[(${location.inLock} != '-') || (${location.outLock} != '-')]]></enableExpression>
-            </popup>
-            <popup id="batchNew" title="batchNew" enableType="none" invisible="false" containId="false" pageId="editBatchLocationPage"/>
-            <popup id="editLocations" title="editLocations" enableType="multi" invisible="false" containId="true" pageId="editLocationsPage">
-                <enableExpression><![CDATA[(${location.disabled}=='false')]]></enableExpression>
-            </popup>
-            <commit id="deleteLocations" title="deleteLocations" enableType="multi" invisible="false" confirmMessage="maintainLocationPage.deleteLocations.confirmMessage">
-                <enableExpression><![CDATA[(${location.disabled}=='false')]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="locationManager" methodName="deleteBatchLocations" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <popup id="viewPositions" title="maintainLocationPage.viewPositions" enableType="single" invisible="false" containId="true" pageId="viewPostionsPage"/>
-<!--             <popup id="analyse" title="maintainLocationPage.analyse" enableType="single" invisible="false" containId="true" pageId="locationAnalysePage"/> -->
-         <popup id="importOrderButton" title="库位导入" enableType="none" invisible="false" containId="false" pageId="editImportLocationPage"/>
-        </buttons>
-    </maintainPage>
-</pages>