波次增加类型（原逻辑、新逻辑）增加新页面波次(新)，过滤只有新逻辑的波次数据。以前的数据创建类型位原逻辑

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

@@ -113,9 +113,16 @@ public class WaveDoc extends AbstractMoveDoc {
 	private int longtiem=0;//时长
 	private int hjqQty=0;//货架工作站数
 	private int lkqQty=0;
+	/** 0-原逻辑，1-新逻辑 */
+	private int logic=0;
 	
 	
-	
+	public int getLogic() {
+		return logic;
+	}
+	public void setLogic(int logic) {
+		this.logic = logic;
+	}
 	public int getLxqQty() {
 		return lxqQty;
 	}

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

@@ -81,7 +81,7 @@
 		<property name="hjqQty" column="hjqQty" type="integer" />
 		<property name="lkqQty" column="lkqQty" type="integer" />
 		<property name="longtiem" column="longtiem" type="integer" />
-		
+		<property name="logic" type="int" length="10" column="LOGIN" />
 	</class>
 	<query name="getWaveDocByCode">
 		<![CDATA[ from WaveDoc waveDoc 

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

@@ -761,7 +761,7 @@ public interface PickTicketManager extends BaseManager {
 		//添加任务到波次
 		@Transactional
 		List<Long> addTaskToWaveDocDetail( List<Long> ids,Date date1,Date date2 ,Integer longtiem,Integer lxqQty,
-				Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty);	
+				Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty,Integer logic);	
 		//PDA领取合单任务，
 		@Transactional
 	   void receiveBillTask(String taskids, Long workerId);	

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

@@ -332,7 +332,7 @@ public class DefaultNewWaveDocManager extends DefaultBaseManager implements
 			}
 			
 			if(Tasks.size()>0){
-				pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty);
+				pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty,1);
 			}
 			
 			try {

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

@@ -8477,7 +8477,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 	
 	@Override
 	public List<Long> addTaskToWaveDocDetail( List<Long> ids,Date date1,Date date2 ,Integer longtiem,
-			Integer lxqQty,Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty) {
+			Integer lxqQty,Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty,Integer logic) {
 		WaveDoc waveDoc=EntityFactory.getEntity(WaveDoc.class);
 		waveDoc.setCode(TimeNumberUtils.getwaveDocCode());
 		waveDoc.setWarehouse(WarehouseHolder.getWarehouse());
@@ -8492,6 +8492,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 		waveDoc.setHjqQty(hjqQty);
 		waveDoc.setLongtiem(longtiem);
 		waveDoc.setApplyDoc(pickCode);
+		waveDoc.setLogic(logic);
 		waveDoc.setStartDate(date1);
 		waveDoc.setEndDate(date2);
 		waveDoc.setPrintCount(taskqty);//拆分行数

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

@@ -2699,7 +2699,7 @@ public class DefaultWaveDocManager extends DefaultBaseManager implements
 			}
 			
 			if(Tasks.size()>0){
-				pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty);
+				pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty,0);
 			}
 			
 			try {

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

@@ -140,7 +140,7 @@
         		<!-- <menuItem title="波次配置" pageId="maintainWaveDocFigPage"/>
 	        	<menuItem title="创波排序组合" pageId="maintainTaskSortPage"/> -->
 	        	<menuItem title="波次排序规则" pageId="maintainWaveDocSortPage"/>
-	        	<menuItem title="波次" pageId="newMaintainWaveDocPage"/>
+	        	<menuItem title="波次" pageId="maintainNewWaveDocPage"/>
         	</menuItem>
         	<menuItem title="波次" pageId="maintainWaveDocPage"/>
         	<menuItem title="插单" pageId="maintainPickTicketInsertPage"/>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-	<maintainPage id="maintainNewWaveDocPage" title="波次管理" autoQuery="false">
+	<maintainPage id="maintainNewWaveDocPage" title="波次管理(新)" autoQuery="false">
 		<search>
 			<inputUIs>
 				<text id="waveDoc.code" title="waveDoc.code" row="1" col="1"
@@ -56,6 +56,7 @@
  /~beginDate: AND CONVERT(varchar(100), waveDoc.createDate, 23) = {beginDate} ~/
  /~endDate: or (CONVERT(varchar(100), waveDoc.createDate, 23)>= {beginDate} and CONVERT(varchar(100), waveDoc.createDate, 23)<= {endDate})  ~/
  )
+ and waveDoc.logic=1
  order by waveDoc.id desc
 ]]></datasource>
 		<columns>

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

@@ -56,6 +56,7 @@
  /~beginDate: AND CONVERT(varchar(100), waveDoc.createDate, 23) = {beginDate} ~/
  /~endDate: or (CONVERT(varchar(100), waveDoc.createDate, 23)>= {beginDate} and CONVERT(varchar(100), waveDoc.createDate, 23)<= {endDate})  ~/
  )
+ and waveDoc.logic=0
  order by waveDoc.id desc
 ]]></datasource>
 		<columns>

src/webapp/WEB-INF/classes/dataSourceContext.xml

@@ -24,10 +24,10 @@
         </property>
         <property name="url">
 <!--         	<value>jdbc:sqlserver://localhost:1433;DatabaseName=zwtest</value> -->
-<!--          	<value>jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest</value> -->
+         	<value>jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest</value>
 <!-- 	正式环境地址 -->
 <!-- 				<value>jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB</value> -->
-        	<value>jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest</value>
+        	<!-- <value>jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest</value> -->
         </property>
         <property name="username">
          <value>WMSDB</value>