diff --git a/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java b/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java
new file mode 100644
index 0000000..cd76e41
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/TaskSort.java
@@ -0,0 +1,49 @@
+package com.dev.swms.server.model.shipping;
+
+import java.util.Date;
+import java.util.Set;
+
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.Structure;
+import com.dev.swms.server.model.base.Warehouse;
+import com.dev.swms.server.model.base.Worker;
+import com.dev.energy.server.model.Entity;
+
+public class TaskSort extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 名称 */
+	private String name;
+	/** 数据库字段名 */
+	private String colume;
+	/** 顺序*/
+	private double sort;
+	/** 是否禁用*/
+	private boolean disabled=false;
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getColume() {
+		return colume;
+	}
+	public void setColume(String colume) {
+		this.colume = colume;
+	}
+	public double getSort() {
+		return sort;
+	}
+	public void setSort(double sort) {
+		this.sort = sort;
+	}
+	public boolean isDisabled() {
+		return disabled;
+	}
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java b/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java
new file mode 100644
index 0000000..26613be
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/WaveDocSort.java
@@ -0,0 +1,49 @@
+package com.dev.swms.server.model.shipping;
+
+import java.util.Date;
+import java.util.Set;
+
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.Structure;
+import com.dev.swms.server.model.base.Warehouse;
+import com.dev.swms.server.model.base.Worker;
+import com.dev.energy.server.model.Entity;
+
+public class WaveDocSort extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 名称 */
+	private String name;
+	/** 数据库字段名 */
+	private String colume;
+	/** 顺序*/
+	private double sort;
+	/** 是否禁用*/
+	private boolean disabled=false;
+	
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getColume() {
+		return colume;
+	}
+	public void setColume(String colume) {
+		this.colume = colume;
+	}
+	public double getSort() {
+		return sort;
+	}
+	public void setSort(double sort) {
+		this.sort = sort;
+	}
+	public boolean isDisabled() {
+		return disabled;
+	}
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml
new file mode 100644
index 0000000..e506bab
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/taskSort.hbm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC 
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+	<class name="com.dev.swms.server.model.shipping.TaskSort" table="TASK_SORT">
+		<id name="id" column="ID" type="long">
+			<generator class="native">
+				<param name="sequence">wms_taskSort</param>
+				<param name="parameters">START WITH 1000</param>
+			</generator>
+		</id>
+		<property name="name" column="NAME" type="string" />
+		<property name="colume" column="COLUME" type="string" />
+		<property name="sort" column="SORT" type="double" />
+		<property name="disabled" column="DISABLED" type="boolean" />
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
new file mode 100644
index 0000000..eb2ae89
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/shipping/waveDocSort.hbm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC 
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+	<class name="com.dev.swms.server.model.shipping.WaveDocSort" table="WAVE_DOC_SORT">
+		<id name="id" column="ID" type="long">
+			<generator class="native">
+				<param name="sequence">wms_waveDocSort</param>
+				<param name="parameters">START WITH 1000</param>
+			</generator>
+		</id>
+		<property name="name" column="NAME" type="string" />
+		<property name="colume" column="COLUME" type="string" />
+		<property name="sort" column="SORT" type="double" />
+		<property name="disabled" column="DISABLED" type="boolean" />
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java
new file mode 100644
index 0000000..c9a0f1d
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/TaskSortManager.java
@@ -0,0 +1,13 @@
+package com.dev.swms.server.service.shipping;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import com.dev.energy.server.service.BaseManager;
+import com.dev.swms.server.model.shipping.TaskSort;
+import com.dev.swms.server.model.shipping.WaveDoc;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+
+public interface TaskSortManager extends BaseManager {
+	@Transactional
+	public void saveTaskSort(TaskSort ts);
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java
new file mode 100644
index 0000000..c0849e4
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/WaveDocSortManager.java
@@ -0,0 +1,13 @@
+package com.dev.swms.server.service.shipping;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import com.dev.energy.server.service.BaseManager;
+import com.dev.swms.server.model.shipping.WaveDoc;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.model.shipping.WaveDocSort;
+
+public interface WaveDocSortManager extends BaseManager {
+	@Transactional
+	void saveWaveDocSort(WaveDocSort wds);
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java
new file mode 100644
index 0000000..686ebdf
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultTaskSortManager.java
@@ -0,0 +1,20 @@
+package com.dev.swms.server.service.shipping.pojo;
+
+import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
+import com.dev.swms.server.model.shipping.TaskSort;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.service.shipping.TaskSortManager;
+import com.dev.swms.server.service.shipping.WaveDocFigManager;
+import com.dev.swms.server.service.shipping.WaveDocSortManager;
+
+public class DefaultTaskSortManager extends DefaultBaseManager implements
+	TaskSortManager {
+
+	@Override
+	public void saveTaskSort(TaskSort ts) {
+		// TODO 自动生成的方法存根
+		commonDao.store(ts);
+	}
+	
+}
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java
new file mode 100644
index 0000000..3e9ed4f
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocSortManager.java
@@ -0,0 +1,20 @@
+package com.dev.swms.server.service.shipping.pojo;
+
+import com.dev.energy.server.service.pojo.DefaultBaseManager;
+import com.dev.swms.server.model.inventory.Task;
+import com.dev.swms.server.model.shipping.WaveDocFig;
+import com.dev.swms.server.model.shipping.WaveDocSort;
+import com.dev.swms.server.service.shipping.WaveDocFigManager;
+import com.dev.swms.server.service.shipping.WaveDocSortManager;
+
+public class DefaultWaveDocSortManager extends DefaultBaseManager implements
+	WaveDocSortManager {
+
+	@Override
+	public void saveWaveDocSort(WaveDocSort wds) {
+		// TODO 自动生成的方法存根
+		commonDao.store(wds);
+	}
+
+	
+}
diff --git a/src/main/java/daoContext.xml b/src/main/java/daoContext.xml
index 233a00c..376a78f 100644
--- a/src/main/java/daoContext.xml
+++ b/src/main/java/daoContext.xml
@@ -501,7 +501,18 @@
             <value>com/dev/swms/server/model/shipping/waveDocFig.hbm.xml</value>
         </constructor-arg>
     </bean>
-    
+    <!--创波排序组合排序规则创波-->
+    <bean id="waveDocSortHibernateMappingResource" class="com.dev.energy.server.dao.hibernate.HibernateMappingResource">
+        <constructor-arg>
+            <value>com/dev/swms/server/model/shipping/waveDocSort.hbm.xml</value>
+        </constructor-arg>
+    </bean>
+    <!--创波排序组合-->
+    <bean id="taskSortHibernateMappingResource" class="com.dev.energy.server.dao.hibernate.HibernateMappingResource">
+        <constructor-arg>
+            <value>com/dev/swms/server/model/shipping/taskSort.hbm.xml</value>
+        </constructor-arg>
+    </bean>
    <!--  预波次单 -->
    <bean id="prewaveHibernateMappingResource" class="com.dev.energy.server.dao.hibernate.HibernateMappingResource">
         <constructor-arg>
diff --git a/src/main/java/serviceContext.xml b/src/main/java/serviceContext.xml
index 35dfc88..bb09a00 100644
--- a/src/main/java/serviceContext.xml
+++ b/src/main/java/serviceContext.xml
@@ -590,6 +590,24 @@
 			</bean>
 		</property>
 	</bean>
+	<bean id="waveDocSortManager" parent="abstractTransactionProxy">
+		<property name="target">
+			<bean
+				class="com.dev.swms.server.service.shipping.pojo.DefaultWaveDocSortManager"
+				parent="baseManager">
+				
+			</bean>
+		</property>
+	</bean>
+	<bean id="taskSortManager" parent="abstractTransactionProxy">
+		<property name="target">
+			<bean
+				class="com.dev.swms.server.service.shipping.pojo.DefaultTaskSortManager"
+				parent="baseManager">
+				
+			</bean>
+		</property>
+	</bean>
 	<bean id="masterBolManager" parent="abstractTransactionProxy">
 		<property name="target">
 			<bean
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editTaskSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editTaskSortPage.xml
new file mode 100644
index 0000000..21f497e
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editTaskSortPage.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editTaskSortPage" title="创波排序组合"
+		entityClass="com.dev.swms.server.model.shipping.TaskSort" width="300"
+		height="310">
+		<inputUIs>
+			<hidden id="ts.id" reserve="false" />
+			<text id="ts.name" title="名称" row="1" col="1" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="ts.colume" title="数据库字段名" row="2" col="1" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="ts.sort" title="排序" row="3" col="1" span="2" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<booleanList id="ts.disabled" title="是否禁用" defaultValue="false" row="7" col="1" span="1" readOnly="false" required="true" reserve="true" forceOverride="true" inVisible="false"/>
+		</inputUIs>
+		<buttons>
+			<commit id="save" title="save" enableType="none" invisible="false">
+				<mappings>
+					<mapping id="ts" className="com.dev.swms.server.model.shipping.TaskSort" />
+				</mappings>
+				<actions>
+					<action managerName="taskSortManager" methodName="saveTaskSort"
+						parameter="ts" />
+				</actions>
+				<forwards>
+					<forward name="refreshParent" 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/editWaveDocSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml
new file mode 100644
index 0000000..e597672
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editWaveDocSortPage.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editWaveDocSortPage" title="排序规则创波"
+		entityClass="com.dev.swms.server.model.shipping.WaveDocSort" width="300"
+		height="310">
+		<inputUIs>
+			<hidden id="wds.id" reserve="false" />
+			<text id="wds.name" title="名称" row="1" col="1" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="wds.colume" title="数据库字段名" row="2" col="1" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="wds.sort" title="排序" row="3" col="1" span="2" width="173"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<booleanList id="wds.disabled" title="是否禁用" defaultValue="false" row="7" col="1" span="1" readOnly="false" required="true" reserve="true" forceOverride="true" inVisible="false"/>
+		</inputUIs>
+		<buttons>
+			<commit id="save" title="save" enableType="none" invisible="false">
+				<mappings>
+					<mapping id="wds" className="com.dev.swms.server.model.shipping.WaveDocSort" />
+				</mappings>
+				<actions>
+					<action managerName="waveDocSortManager" methodName="saveWaveDocSort"
+						parameter="wds" />
+				</actions>
+				<forwards>
+					<forward name="refreshParent" 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/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 528171a..8860398 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -136,7 +136,11 @@
 <!--         		<menuItem title="预分配明细" pageId="maintainPreAllocatePage"/> -->
 <!--         		<menuItem title="预分配统计" pageId="maintainViewOnePage"/> -->
 <!--         	</menuItem> -->
-        	<menuItem title="波次配置" pageId="maintainWaveDocFigPage"/>
+			<menuItem title="配置信息" dir="configPool">
+        		<menuItem title="波次配置" pageId="maintainWaveDocFigPage"/>
+	        	<menuItem title="创波排序组合" pageId="maintainTaskSortPage"/>
+	        	<menuItem title="排序规则创波" pageId="maintainWaveDocSortPage"/>
+        	</menuItem>
         	<menuItem title="波次" pageId="maintainWaveDocPage"/>
         	<menuItem title="插单" pageId="maintainPickTicketInsertPage"/>
         	<menuItem title="中止" pageId="maintainPickTicketStopPage"/>	
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml
new file mode 100644
index 0000000..ee284b8
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskSortPage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<maintainPage id="maintainTaskSortPage" title="创波排序组合" autoQuery="false">
+		<search>
+			<inputUIs>
+				
+			</inputUIs>
+		</search>
+		<datasource type="hql"><![CDATA[ select  
+ ts.id,
+ ts.name,
+ ts.colume,
+ ts.sort,
+ ts.disabled
+ from TaskSort ts
+ where 1=1 
+]]></datasource>
+		<columns>
+			<column id="ts.id" title="序号" visible="false" horizonAlign="center" verticalAlign="middle" />
+			<column id="ts.name" title="名称" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="ts.colume" title="数据库字段名" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="ts.sort" title="排序" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="ts.disabled" title="是否禁用" visible="true" horizonAlign="center" verticalAlign="middle" />
+		</columns>
+		<buttons>
+			<popup id="new" title="new" enableType="none" invisible="false"
+				containId="false" pageId="editTaskSortPage" />
+			<popup id="modify" title="modify" enableType="single"
+				invisible="false" containId="true" pageId="editTaskSortPage" />
+		</buttons>
+	</maintainPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
index 2ca57b6..bf460ef 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml
@@ -3,31 +3,7 @@
 <pages>
 	<maintainPage id="maintainWaveDocFigPage" title="波次组合管理" autoQuery="false">
 		<search>
-			<inputUIs>
-				<text id="waveDoc.code" title="waveDoc.code" row="1" col="1"
-					span="1" readOnly="false" required="false" reserve="false"
-					forceOverride="true" inVisible="false" trimSpace="true" />
-				<!-- <list id="waveDoc.status" title="waveDoc.status" row="1" col="2"
-					span="1" width="120" readOnly="false" required="false" reserve="false"
-					forceOverride="true" enumType="WaveDocStatus">
-					<hql><![CDATA[SELECT 
- enumerate.enumValue,
- enumerate.enumValue From Enumerate enumerate 
- where enumerate.enumType = 'WaveDocStatus'
- order by enumerate.id]]></hql>
-				</list> -->
-				<date id="beginDate" title="创建日期" row="2" col="1"
-					readOnly="false" required="false" reserve="false" forceOverride="false"
-					inVisible="false" showTime="false" manualEditable="true"
-					defaultCurrentDate="false" />	
-				<date id="endDate" title="至" row="2" col="1"
-					readOnly="false" required="false" reserve="false" forceOverride="false"
-					inVisible="false" showTime="false" manualEditable="true"
-					defaultCurrentDate="false" />	
-				 <checkbox id="ordersAll" title="ordersAll" row="3" col="2" defaultValue="false" 
-				 span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-				
-			</inputUIs>
+			
 		</search>
 		<datasource type="hql"><![CDATA[ select  
  wdf.id,
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocSortPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocSortPage.xml
new file mode 100644
index 0000000..357da46
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocSortPage.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<maintainPage id="maintainWaveDocSortPage" title="排序规则创波" autoQuery="false">
+		<search>
+			<inputUIs>
+				
+			</inputUIs>
+		</search>
+		<datasource type="hql"><![CDATA[ select  
+ wds.id,
+ wds.name,
+ wds.colume,
+ wds.sort,
+ wds.disabled
+ from WaveDocSort wds
+ where 1=1 
+]]></datasource>
+		<columns>
+			<column id="wds.id" title="序号" visible="false" horizonAlign="center" verticalAlign="middle" />
+			<column id="wds.name" title="名称" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="wds.colume" title="数据库字段名" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="wds.sort" title="排序" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="wds.disabled" title="是否禁用"
+				visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"
+				formatParam="disabled" />
+		</columns>
+		<buttons>
+			<popup id="new" title="new" enableType="none" invisible="false"
+				containId="false" pageId="editWaveDocSortPage" />
+			<popup id="modify" title="modify" enableType="single"
+				invisible="false" containId="true" pageId="editWaveDocSortPage" />
+		</buttons>
+	</maintainPage>
+</pages>