diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
similarity index 99%
rename from src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java
rename to src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
index 9c7a83a..0e563d3 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java
+++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
@@ -90,7 +90,7 @@ import org.apache.log4j.Logger;
  * @author  dev
  *
  */
-public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAutoAllocator {
+public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAutoAllocator {
 	protected final ItemManager itemManager;
 	protected final InventoryManager inventoryManager;
 	protected final BussinessCodeManager bussinessCodeManager;
@@ -103,7 +103,7 @@ public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAu
 	private static Logger logger = Logger.getLogger(DefaultAutoAllocator.class); 
 	
 	
-    public NewDefaultAutoAllocator(ItemManager manager,InventoryManager manager1,
+    public DefaultNewAutoAllocator(ItemManager manager,InventoryManager manager1,
     		BussinessCodeManager manager2, PutawayAllocator allocator,InterfaceManager interfaceManager2,JdbcManager jdbcManager2,AgvTaskManager agvTaskManager,
     		InterfaceReqManager interfaceReqManager) {
 		itemManager = manager;
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java
similarity index 99%
rename from src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java
rename to src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java
index df1f2d6..82d6bf1 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java
@@ -32,7 +32,7 @@ import com.dev.swms.server.service.shipping.PickTicketManager;
 import com.dev.swms.server.utils.TimeNumberUtils;
 
 
-public class NewDefaultWaveDocManager extends DefaultBaseManager implements
+public class DefaultNewWaveDocManager extends DefaultBaseManager implements
 		NewWaveDocManager {
 
 	private static Logger logger = Logger.getLogger(DefaultWaveDocManager.class); 
@@ -44,7 +44,7 @@ public class NewDefaultWaveDocManager extends DefaultBaseManager implements
 	protected final JdbcManager jdbcManager;
 	protected  static Date hotWaveDate=new Date();//波次创建，判断不能同时新建
 	protected  static boolean hotWave=true;//波次创建，判断不能同时新建
-	public NewDefaultWaveDocManager(PickTicketManager pickTicketManager, NewAutoAllocator autoAllocator,
+	public DefaultNewWaveDocManager(PickTicketManager pickTicketManager, NewAutoAllocator autoAllocator,
 			InventoryManager inventoryManager, ItemManager itemManager,BussinessCodeManager bussinessCodeManager,JdbcManager jdbcManager) {
 		this.pickTicketManager = pickTicketManager;
 		this.autoAllocator = autoAllocator;
diff --git a/src/main/java/serviceContext.xml b/src/main/java/serviceContext.xml
index 06b661d..d49eda8 100644
--- a/src/main/java/serviceContext.xml
+++ b/src/main/java/serviceContext.xml
@@ -584,7 +584,7 @@
 	<bean id="newWaveDocManager" parent="abstractTransactionProxy">
 		<property name="target">
 			<bean
-				class="com.dev.swms.server.service.shipping.pojo.NewDefaultWaveDocManager"
+				class="com.dev.swms.server.service.shipping.pojo.DefaultNewWaveDocManager"
 				parent="baseManager">
 				<constructor-arg index="0">
 					<ref local="pickTicketManager" />
@@ -759,7 +759,7 @@
 	<bean id="newAutoAllocator" parent="abstractTransactionProxy">
 		<property name="target">
 			<bean
-				class="com.dev.swms.server.service.picking.allocate.NewDefaultAutoAllocator"
+				class="com.dev.swms.server.service.picking.allocate.DefaultNewAutoAllocator"
 				parent="baseManager">
 				<constructor-arg index="0">
 					<ref local="itemManager" />
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml
similarity index 98%
rename from src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml
rename to src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml
index 2c5f1fc..2297d7d 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-	<editPage id="newEditbkcbPage" title="创建波次" onClose="refreshParent" width="600" height="360">
+	<editPage id="editNewbkcbPage" title="创建波次" onClose="refreshParent" width="600" height="360">
 		<inputUIs>
 			<date id="date1" title="开始日期" row="1" col="1" span="1" readOnly="false" 	required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>			
 			<textArea id="pickCode" title="工单选择" row="1" col="2" span="4" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="5" cols="30" />
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/newMaintainWaveDocPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml
similarity index 98%
rename from src/webapp/WEB-INF/classes/config/origen/shipping/newMaintainWaveDocPage.xml
rename to src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml
index b791b11..783c1d7 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/newMaintainWaveDocPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-	<maintainPage id="newMaintainWaveDocPage" title="波次管理" autoQuery="false">
+	<maintainPage id="maintainNewWaveDocPage" title="波次管理" autoQuery="false">
 		<search>
 			<inputUIs>
 				<text id="waveDoc.code" title="waveDoc.code" row="1" col="1"
@@ -74,7 +74,7 @@
 			<column id="waveDoc.updateTime2" title="完成时间" visible="true" horizonAlign="center" verticalAlign="middle" format="dateTiemFormatter"/>
 		</columns>
 		<buttons>
-			<popup id="bkcb" title="创建波次" enableType="none" invisible="false" containId="false" pageId="newEditbkcbPage" />
+			<popup id="bkcb" title="创建波次" enableType="none" invisible="false" containId="false" pageId="editNewbkcbPage" />
 			<popup id="issuedAgvTask" title="下发工作站任务" enableType="single" invisible="false"
 				containId="true" pageId="modifyIssuedAgvTaskPage1" />
 	<commit id="allocate21" title="下发AGV"