changes index of preparestament by Megha

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97207 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -545,11 +545,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					  
 					   getDataSql = getDataSql + " AND CUSTOMER.CUST_CODE >=? "
 					   // Changed by Megha on 22/01/2015 :D14JSUN007  batch_id for back order processing..end 
-					   +" CUSTOMER.CUST_CODE <=? AND "  
+					   +" AND CUSTOMER.CUST_CODE <=? AND "  
 					   +" SORDER.CUST_CODE__DLV >=? AND " 	
 					   +" SORDER.CUST_CODE__DLV <=? AND " 
-					   +" SORDER.SALE_ORDER >= ? AND "
-					   +" SORDER.SALE_ORDER <= ? AND " 
+					  // +" SORDER.SALE_ORDER >= ? AND "
+					 //  +" SORDER.SALE_ORDER <= ? AND " 
 					   +" SORDER.DUE_DATE >=  ?  AND" 
 					   +" SORDER.DUE_DATE <= ? " 
 					   +" AND SORDER.CUST_CODE__DLV = C.CUST_CODE "  
@@ -620,10 +620,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					pstmt.setString(6,batchID);
 					pstmt.setString(7,custCodeFr);
 					pstmt.setString(8,custCodeTo);
-					pstmt.setTimestamp(9,dateFr);
-					pstmt.setTimestamp(10,dateTo);
-					pstmt.setString(11,custCodeDlvFr);
-					pstmt.setString(12,custCodeDlvTo); 
+					
+					pstmt.setString(9,custCodeDlvFr);
+					pstmt.setString(10,custCodeDlvTo); 
+					
+					pstmt.setTimestamp(11,dateFr);
+					pstmt.setTimestamp(12,dateTo);
+					
 					if( saleOrdertype != null && saleOrdertype.trim().length() > 0 )
 					{
 						System.out.println("ordtypeGetData::::::::"+saleOrdertype);
@@ -635,13 +638,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					pstmt.setString(7,saleOrderTo);
 					pstmt.setString(8,custCodeFr);
 					pstmt.setString(9,custCodeTo);
-					pstmt.setTimestamp(10,dateFr);
-					pstmt.setTimestamp(11,dateTo);
-					pstmt.setString(12,custCodeDlvFr);
-					pstmt.setString(13,custCodeDlvTo);
+					
+					pstmt.setString(10,custCodeDlvFr);
+					pstmt.setString(11,custCodeDlvTo);
+					
+					pstmt.setTimestamp(12,dateFr);
+					pstmt.setTimestamp(13,dateTo);
+					
 					if( saleOrdertype != null && saleOrdertype.trim().length() > 0 )
 					{
-						System.out.println("ordtypeGetData::::::::"+saleOrdertype);
+						System.out.println("ordtypeGetData1::::::::"+saleOrdertype);
 						pstmt.setString(14,saleOrdertype);
 					}
 				}