Merge remote-tracking branch 'origin/main'

.classpath

@@ -118,6 +118,6 @@
 	<classpathentry kind="var" path="MAVEN_REPO/thumbnailator/thumbnailator-0.4.8.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.2.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-1.3.2.jar"/>
-	<classpathentry kind="lib" path="D:/maven-1.0.2/repository/poi/jars/poi-3.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/poi/jars/poi-3.0.1.jar"/>
 	<classpathentry kind="output" path="target/zwwms/WEB-INF/classes"/>
 </classpath>

src/main/java/com/dev/swms/server/model/base/ShiXiao.java

@@ -13,9 +13,36 @@ public class ShiXiao extends VersionalEntity{
 	private double pandian;//盘点效率
 	
 	private double zhengli;//整理效率
+	private double taskD;//任务拆分行数
+	private double gzzD;//工作站自动补波行
+	private double gzzT;//补波时长（分）
 	
 	private WarehouseArea warehouseArea;//库区
 
+	public double getTaskD() {
+		return taskD;
+	}
+
+	public void setTaskD(double taskD) {
+		this.taskD = taskD;
+	}
+
+	public double getGzzD() {
+		return gzzD;
+	}
+
+	public void setGzzD(double gzzD) {
+		this.gzzD = gzzD;
+	}
+
+	public double getGzzT() {
+		return gzzT;
+	}
+
+	public void setGzzT(double gzzT) {
+		this.gzzT = gzzT;
+	}
+
 	/** 是否有效 */
 	private boolean disabled = false;
 	

src/main/java/com/dev/swms/server/model/base/shixiao.hbm.xml

@@ -17,12 +17,15 @@
 		<property name="number" column="number" type="double" />
 		<property name="pandian" column="pandian" type="double" />
 		<property name="zhengli" column="zhengli" type="double" />
+		<property name="taskD" column="task_d" type="double" />
+		<property name="gzzD" column="gzz_d" type="double" />
+		<property name="gzzT" column="gzz_t" type="double" />
 		<many-to-one name="warehouseArea"
 			class="com.dev.swms.server.model.base.WarehouseArea">
 			<column name="warehouseArea" />
 		</many-to-one>
-		<property name="disabled" column="DISABLED" type="boolean"/>
+		<property name="disabled" column="DISABLED" type="boolean" />
-		<property name="efficiency" column="efficiency" type="integer"/>
+		<property name="efficiency" column="efficiency" type="integer" />
 
 	</class>
 </hibernate-mapping>

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;
+	}
+	
+	
+}

src/main/java/com/dev/swms/server/model/shipping/WaveDocFig.java

@@ -0,0 +1,38 @@
+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 WaveDocFig extends Entity {
+	private static final long serialVersionUID = 1L;
+	/** 下发单量 */
+	private double pickD;
+	/** 拆分行数*/
+	private double taskD;
+	/** 工作站效能*/
+	private double gzzD;
+	public double getPickD() {
+		return pickD;
+	}
+	public void setPickD(double pickD) {
+		this.pickD = pickD;
+	}
+	public double getTaskD() {
+		return taskD;
+	}
+	public void setTaskD(double taskD) {
+		this.taskD = taskD;
+	}
+	public double getGzzD() {
+		return gzzD;
+	}
+	public void setGzzD(double gzzD) {
+		this.gzzD = gzzD;
+	}
+	
+}

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;
+	}
+	
+	
+}

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>

src/main/java/com/dev/swms/server/model/shipping/waveDocFig.hbm.xml

@@ -0,0 +1,17 @@
+<?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.WaveDocFig" table="WAVE_DOC_FIG">
+		<id name="id" column="ID" type="long">
+			<generator class="native">
+				<param name="sequence">wms_waveDocFig</param>
+				<param name="parameters">START WITH 1000</param>
+			</generator>
+		</id>
+		<property name="pickD" column="PICK_D" type="double" />
+		<property name="taskD" column="TASK_D" type="double" />
+		<property name="gzzD" column="GZZ_D" type="double" />
+	</class>
+</hibernate-mapping>

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>

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);
+}

src/main/java/com/dev/swms/server/service/shipping/WaveDocFigManager.java

@@ -0,0 +1,12 @@
+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;
+
+public interface WaveDocFigManager extends BaseManager {
+	@Transactional
+	public void saveWaveDocFig(WaveDocFig wdf);
+}

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);
+}

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);
+	}
+	
+}

src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocFigManager.java

@@ -0,0 +1,16 @@
+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.service.shipping.WaveDocFigManager;
+
+public class DefaultWaveDocFigManager extends DefaultBaseManager implements
+		WaveDocFigManager {
+
+	@Override
+	public void saveWaveDocFig(WaveDocFig wdf) {
+		// TODO 自动生成的方法存根
+		commonDao.store(wdf);
+	}
+}

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);
+	}
+
+	
+}

src/main/java/daoContext.xml

@@ -495,7 +495,24 @@
             <value>com/dev/swms/server/model/shipping/waveDoc.hbm.xml</value>
         </constructor-arg>
     </bean>
-    
+    <!--波次组合配置-->
+    <bean id="waveDocFigHibernateMappingResource" class="com.dev.energy.server.dao.hibernate.HibernateMappingResource">
+        <constructor-arg>
+            <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>

src/main/java/serviceContext.xml

@@ -581,6 +581,33 @@
 			</bean>
 		</property>
 	</bean>
+	<bean id="waveDocFigManager" parent="abstractTransactionProxy">
+		<property name="target">
+			<bean
+				class="com.dev.swms.server.service.shipping.pojo.DefaultWaveDocFigManager"
+				parent="baseManager">
+				
+			</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

src/webapp/WEB-INF/classes/config/origen/base/editShiXiaoPage.xml

@@ -2,21 +2,16 @@
 
 <pages>
 	<editPage id="editShiXiaoPage" title="工作站时效信息"
-		entityClass="com.dev.swms.server.model.base.ShiXiao" width="400"
+		entityClass="com.dev.swms.server.model.base.ShiXiao" width="500"
 		height="310">
 		<inputUIs>
 			<hidden id="shixiao.id" reserve="false" />
-			<!-- <list id="shixiao.locationStorage.id" title="工作站" row="0" col="1" span="1"
+			<!-- <list id="shixiao.locationStorage.id" title="工作站" row="0" col="1" 
-				width="120" readOnly="false" required="true" reserve="false"
+				span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" 
-				forceOverride="true" >
+				> <hql><![CDATA[select locationStorage.id, locationStorage.name from LocationStorage 
-				<hql><![CDATA[select
+				locationStorage where 1=1 ]]></hql> </list> -->
- locationStorage.id,
+			<list id="shixiao.warehouseArea.id" title="库区" row="1" col="1"
- locationStorage.name
+				span="1" width="120" readOnly="false" required="true" reserve="false"
- from LocationStorage locationStorage 
- where 1=1 ]]></hql>
-			</list> -->
-			<list id="shixiao.warehouseArea.id" title="库区" row="1" col="1" span="1"
-				width="120" readOnly="false" required="true" reserve="false"
 				forceOverride="true">
 				<hql><![CDATA[select
  warehouseArea.id,
@@ -24,22 +19,27 @@
  from WarehouseArea warehouseArea
  where 1=1 ]]></hql>
 			</list>
-			<text id="shixiao.time" title="时间(分)" row="2" col="1"
+			<text id="shixiao.time" title="时间(分)" row="2" col="1" width="173"
-				width="173" readOnly="false" required="true" reserve="false"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
-				forceOverride="false" inVisible="false" length="100" trimSpace="true"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
-				isPrecision="true" />
+			<text id="shixiao.number" title="拣货效率" row="2" col="2" width="173"
-			<text id="shixiao.number" title="拣货效率" row="2" col="2"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
-				width="173" readOnly="false" required="true" reserve="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
-				forceOverride="false" inVisible="false" length="100" trimSpace="true"
+			<text id="shixiao.pandian" title="盘点效率" row="3" col="1" width="173"
-				isPrecision="true" />
+				readOnly="false" required="true" reserve="false" forceOverride="false"
-			<text id="shixiao.pandian" title="盘点效率" row="3" col="1"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
-				width="173" readOnly="false" required="true" reserve="false"
+			<text id="shixiao.zhengli" title="整理效率" row="3" col="2" width="173"
-				forceOverride="false" inVisible="false" length="100" trimSpace="true"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
-				isPrecision="true" />
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
-			<text id="shixiao.zhengli" title="整理效率" row="3" col="2"
+			<text id="shixiao.taskD" title="拆分行数" row="4" col="1" width="173" defaultValue="0"
-				width="173" readOnly="false" required="true" reserve="false"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
-				forceOverride="false" inVisible="false" length="100" trimSpace="true"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
-				isPrecision="true" />
+			<text id="shixiao.gzzD" title="补波行数" row="4" col="2" width="173" defaultValue="0"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="shixiao.gzzD" title="补波时长" row="5" col="1" span="2" width="173" defaultValue="0"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
 		</inputUIs>
 		<buttons>
 			<commit id="save" title="save" enableType="none" invisible="false">

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>

src/webapp/WEB-INF/classes/config/origen/base/editWaveDocFigPage.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editWaveDocFigPage" title="波次组合管理"
+		entityClass="com.dev.swms.server.model.shipping.WaveDocFig" width="300"
+		height="310">
+		<inputUIs>
+			<hidden id="wdf.id" reserve="false" />
+			<text id="wdf.pickD" title="下发单量" row="1" col="1" width="173" defaultValue="0"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="wdf.taskD" title="拆分行数" row="2" col="1" width="173" defaultValue="0"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+			<text id="wdf.gzzD" title="工作站效能" row="3" col="1" span="2" width="173" defaultValue="0"
+				readOnly="false" required="true" reserve="false" forceOverride="false"
+				inVisible="false" length="100" trimSpace="true" isPrecision="true" />
+		</inputUIs>
+		<buttons>
+			<commit id="save" title="save" enableType="none" invisible="false">
+				<mappings>
+					<mapping id="wdf" className="com.dev.swms.server.model.shipping.WaveDocFig" />
+				</mappings>
+				<actions>
+					<action managerName="waveDocFigManager" methodName="saveWaveDocFig"
+						parameter="wdf" />
+				</actions>
+				<forwards>
+					<forward name="refreshParent" newEnabled="true"
+						editEnabled="true" />
+					<forward name="resetWindow" newEnabled="true" editEnabled="false" />
+				</forwards>
+			</commit>
+		</buttons>
+	</editPage>
+</pages>

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>

src/webapp/WEB-INF/classes/config/origen/base/maintainShiXiaoPage.xml

@@ -6,15 +6,10 @@
 		<search>
 
 			<inputUIs>
-				<!-- <list id="shixiao.locationStorage.id" title="工作站" row="0" col="1" span="1"
+				<!-- <list id="shixiao.locationStorage.id" title="工作站" row="0" col="1" 
-				width="120" readOnly="false" required="false" reserve="false"
+					span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" 
-				forceOverride="true" >
+					> <hql><![CDATA[select locationStorage.id, locationStorage.name from LocationStorage 
-				<hql><![CDATA[select
+					locationStorage where 1=1 ]]></hql> </list> -->
- locationStorage.id,
- locationStorage.name
- from LocationStorage locationStorage 
- where 1=1 ]]></hql>
-			</list> -->
 				<list id="shixiao.warehouseArea.id" title="库区" row="1" col="1"
 					span="1" width="120px" readOnly="false" required="false" reserve="false"
 					forceOverride="true">
@@ -36,6 +31,9 @@ where 1=1]]></hql>
  shixiao.number,
  shixiao.pandian,
  shixiao.zhengli,
+ shixiao.taskD,
+ shixiao.gzzD,
+ shixiao.gzzT,
  warehouseArea.name,
  shixiao.disabled,
  shixiao.efficiency
@@ -58,41 +56,49 @@ where 1=1]]></hql>
 				horizonAlign="center" />
 			<column id="shixiao.number" title="拣货效率" visible="true" width="80"
 				horizonAlign="center" verticalAlign="middle" />
-			<column id="shixiao.pandian" title="盘点效率" visible="true" width="80"
+			<column id="shixiao.pandian" title="盘点效率" visible="true"
-				horizonAlign="center" verticalAlign="middle" />
+				width="80" horizonAlign="center" verticalAlign="middle" />
-			<column id="shixiao.zhengli" title="整理效率" visible="true" width="80"
+			<column id="shixiao.zhengli" title="整理效率" visible="true"
-				horizonAlign="center" verticalAlign="middle" />
+				width="80" horizonAlign="center" verticalAlign="middle" />
-			<column id="warehouseArea.name" title="库区" visible="true" width="130"
+			<column id="shixiao.taskD" title="子任务拆分行数" visible="true"
-				horizonAlign="center" />
+				width="130" horizonAlign="center" verticalAlign="middle" />
-			<column id="shixiao.disabled" title="是否失效" visible="true" width="80"
+			<column id="shixiao.gzzD" title="工作站自动补波行" visible="true"
-				horizonAlign="center" verticalAlign="middle" format="booleanFormat"
+				width="130" horizonAlign="center" verticalAlign="middle" />
+			<column id="shixiao.gzzT" title="补波时长(分)" visible="true"
+				width="130" horizonAlign="center" verticalAlign="middle" />
+			<column id="warehouseArea.name" title="库区" visible="true"
+				width="130" horizonAlign="center" />
+			<column id="shixiao.disabled" title="是否失效" visible="true"
+				width="80" horizonAlign="center" verticalAlign="middle" format="booleanFormat"
 				formatParam="disabled" />
-			<column id="shixiao.efficiency" title="agv效率" visible="true" width="80"
+			<column id="shixiao.efficiency" title="agv效率" visible="true"
-				horizonAlign="center"/>
+				width="80" horizonAlign="center" />
 		</columns>
 
 		<buttons>
-			<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editShiXiaoPage"/>
+			<popup id="new" title="new" enableType="none" invisible="false"
-			 <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editShiXiaoPage"/>
+				containId="false" pageId="editShiXiaoPage" />
+			<popup id="modify" title="modify" enableType="single"
+				invisible="false" containId="true" pageId="editShiXiaoPage" />
 
-<!-- 			<commit id="delete" title="删除" enableType="multi" -->
+			<!-- <commit id="delete" title="删除" enableType="multi" -->
-<!-- 				invisible="false" confirmMessage="editItemDetailPage.confirm.delete"> -->
+			<!-- invisible="false" confirmMessage="editItemDetailPage.confirm.delete"> -->
-<!-- 				<mappings> -->
+			<!-- <mappings> -->
-<!-- 					<mapping id="ids" className="list" /> -->
+			<!-- <mapping id="ids" className="list" /> -->
-<!-- 				</mappings> -->
+			<!-- </mappings> -->
-<!-- 				<actions> -->
+			<!-- <actions> -->
-<!-- 					<action managerName="shiXiaoManager" methodName="deleteStock" -->
+			<!-- <action managerName="shiXiaoManager" methodName="deleteStock" -->
-<!-- 						parameter="ids" /> -->
+			<!-- parameter="ids" /> -->
-<!-- 				</actions> -->
+			<!-- </actions> -->
-<!-- 				<forwards> -->
+			<!-- <forwards> -->
-<!-- 					<forward name="refreshWindow" newEnabled="true" -->
+			<!-- <forward name="refreshWindow" newEnabled="true" -->
-<!-- 						editEnabled="true" /> -->
+			<!-- editEnabled="true" /> -->
-<!-- 				</forwards> -->
+			<!-- </forwards> -->
-<!-- 			</commit> -->
+			<!-- </commit> -->
 
 			<!-- 失效 -->
-			<commit id="shixiao" title="失效" enableType="multi"
+			<commit id="shixiao" title="失效" enableType="multi" invisible="false"
-				invisible="false" confirmMessage="确认失效？">
+				confirmMessage="确认失效？">
 				<enableExpression><![CDATA[(${shixiao.disabled}=='false')]]></enableExpression>
 				<mappings>
 					<mapping id="ids" className="list" />

src/webapp/WEB-INF/classes/config/origen/menuConfig.xml

@@ -136,6 +136,11 @@
 <!--         		<menuItem title="预分配明细" pageId="maintainPreAllocatePage"/> -->
 <!--         		<menuItem title="预分配统计" pageId="maintainViewOnePage"/> -->
 <!--         	</menuItem> -->
+			<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"/>	

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>

src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocFigPage.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<maintainPage id="maintainWaveDocFigPage" title="波次组合管理" autoQuery="false">
+		<search>
+			
+		</search>
+		<datasource type="hql"><![CDATA[ select  
+ wdf.id,
+ wdf.pickD,
+ wdf.taskD,
+ wdf.gzzD
+ from WaveDocFig wdf
+ where 1=1 
+]]></datasource>
+		<columns>
+			<column id="wdf.id" title="序号" visible="false" horizonAlign="center" verticalAlign="middle" />
+			<column id="wdf.pickD" title="下发单量" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="wdf.taskD" title="拆分行数" visible="true" horizonAlign="center" verticalAlign="middle" />
+			<column id="wdf.gzzD" title="工作站效能" visible="true" horizonAlign="center" verticalAlign="middle" />
+		</columns>
+		<buttons>
+			<popup id="modify" title="modify" enableType="single"
+				invisible="false" containId="true" pageId="editWaveDocFigPage" />
+		</buttons>
+	</maintainPage>
+</pages>

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>