max self life and putaway slow while scaning

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

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

@@ -1223,7 +1223,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 							//Changed by Ameya on 06/09/2012 setting resrvLoc
 							//Changed by sumit on 28/09/12 modified method parameter 
 							//locCodeNew = getLocCode( invStatList,  locType, locPrveZone, conn); 
-							locCodeNew = getLocCode("", invStatList,  locType, locPrveZone, conn);
+							//locCodeNew = getLocCode("", invStatList,  locType, locPrveZone, conn);
 							domID++;
 
 							valueXmlString.append( "<Detail2 domID='"+ domID +"' selected=\"N\">\r\n" );

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

@@ -261,6 +261,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		//Changed by Rohan on 29-12-11 as said by gulzar.start
 		String sSQL  = "";
 		String sSingleLotSql = "";
+		String minMaxSql = "",minMaxSqlLot = "";
 		String resrvLoc  = "";
 		String casePickLoc  = "";
 		String activePickLoc  = "";
@@ -665,13 +666,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					
 					if(maxSelfLife > 0)
 					{
-						sSQL = sSQL + " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN  ? AND  ?  ) ";
-						sSingleLotSql = sSingleLotSql + " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN  ? AND  ?  ) ";
+						minMaxSql =  " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN  ? AND  ?  ) ";
+						minMaxSqlLot =  " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN  ? AND  ?  ) ";
 					}
 					else
 					{
-						sSQL = sSQL + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
-						sSingleLotSql = sSingleLotSql + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
+						minMaxSql = "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
+						minMaxSqlLot =  "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
 					}
 				
 					System.out.println("pendingQty =["+pendingQty+"]");
@@ -835,7 +836,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						else if ( singleLot.trim().length() > 0 && singleLot.trim().equalsIgnoreCase("Y") )
 						{
 							
-							pstmtStock = conn.prepareStatement(sSingleLotSql + orderByStkStr);
+							//pstmtStock = conn.prepareStatement(sSingleLotSql + orderByStkStr);
+							pstmtStock = conn.prepareStatement(sSingleLotSql + minMaxSqlLot + orderByStkStr);
 							pstmtStock.setString(1,"Y");
 							pstmtStock.setString(2,itemCode);
 							pstmtStock.setString(3,siteCode);
@@ -882,7 +884,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						else
 						{
 							//sSQL = sSQL + orderByStkStr;
-							pstmtStock = conn.prepareStatement(sSQL + orderByStkStr);
+							//pstmtStock = conn.prepareStatement(sSQL + orderByStkStr);
+							pstmtStock = conn.prepareStatement(sSQL + minMaxSql + orderByStkStr);
 							pstmtStock.setString(1,"Y");
 							pstmtStock.setString(2,rs.getString(6));
 							pstmtStock.setString(3,rs.getString(12));
@@ -4816,7 +4819,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						   //+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 							if(maxShelfLife > 0)
 							{
-								getDataSql = getDataSql +" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
+								getDataSql = getDataSql +" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ?  ) ";
 							}
 							else
 							{
@@ -4942,7 +4945,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						   +"AND (STOCK.QUANTITY - STOCK.ALLOC_QTY - CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END) > 0  " // 25/06/12 manoharan 
 						   ////Changed by Rohan on 27-08-13 for adding condition of min and max self life
 						   //+"AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) " //Change by Rohan on 4/7/12
-						   +" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ?  ) "
+						   //+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ?  ) "
 				 		   +"AND NOT EXISTS (SELECT 1 FROM INV_RESTR I WHERE I.INV_STAT = INVSTAT.INV_STAT AND I.REF_SER = 'S-DSP' ) ";
 						   //+"AND LOCATION.INV_STAT IN(?,?,?)"//Changed by Rohan on 29-12-11 to consider only RESERV, CASE PICK AND ACTIVE PICK LOCATIONS
 				 		  // +"AND LOCATION.INV_STAT IN(?,?,?,?)"//Changed by Rohan on 29-12-11 to consider only RESERV, CASE PICK AND ACTIVE PICK LOCATIONS
@@ -4950,7 +4953,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				 		  // +"ORDER BY STOCK.EXP_DATE, STOCK.LOC_CODE";//Pragyan on 14/08/2012
 				 		   + orderByStkStr;*/
 				 		  //+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
-					
+							if(maxShelfLife > 0)
+							{
+								getDataSql = getDataSql +" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ?  ) ";
+							}
+							else
+							{
+								getDataSql = getDataSql + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
+							}
 							pstmtStock = conn.prepareStatement(getDataSql + orderByStkStr);
 							
 							pstmtStock.setString(1,itemCode);
@@ -4978,31 +4988,52 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								pstmtStock.setString(8,partialResrvLoc);
 							}
 							*/
-							pstmtStock.setInt(4,maxShelfLife);
-							pstmtStock.setString(5,resrvLoc);
-							pstmtStock.setString(6,casePickLoc);
-							//Changed by sumit on 29/12/12 hiding active pick if user no need from active start
-							//pstmtStock.setString(6,activePickLoc);
-							if( "N".equalsIgnoreCase(isActivePickChecked))
+							if(maxShelfLife > 0)
 							{
-								pstmtStock.setString(7,"");
+								pstmtStock.setInt(4,maxShelfLife);
+								pstmtStock.setString(5,resrvLoc);
+								pstmtStock.setString(6,casePickLoc);
+								//Changed by sumit on 29/12/12 hiding active pick if user no need from active start
+								//pstmtStock.setString(6,activePickLoc);
+								if( "N".equalsIgnoreCase(isActivePickChecked))
+								{
+									pstmtStock.setString(7,"");
+								}
+								else
+								{
+									pstmtStock.setString(7,activePickLoc);
+								}
+								//Changed by sumit on 29/12/12 hiding active pick if user no need from active end
+								pstmtStock.setString(8,deepStoreLoc);
+								
+								if(isActives)
+								{
+									pstmtStock.setString(9,partialResrvLoc);
+								}
+								//Changed by Rohan on 27-08-13 for adding condition of min and max self life.end
 							}
 							else
 							{
-								pstmtStock.setString(7,activePickLoc);
-							}
-							//Changed by sumit on 29/12/12 hiding active pick if user no need from active end
-							pstmtStock.setString(8,deepStoreLoc);
-							
-							if(isActives)
-							{
-								pstmtStock.setString(9,partialResrvLoc);
+								pstmtStock.setString(4,resrvLoc);
+								pstmtStock.setString(5,casePickLoc);
+								
+								if( "N".equalsIgnoreCase(isActivePickChecked))
+								{
+									pstmtStock.setString(6,"");
+								}
+								else
+								{
+									pstmtStock.setString(6,activePickLoc);
+								}
+								pstmtStock.setString(7,deepStoreLoc);
+								
+								if(isActives)
+								{
+									pstmtStock.setString(8,partialResrvLoc);
+								}
 							}
-							//Changed by Rohan on 27-08-13 for adding condition of min and max self life.end
 				}
-					
-			
-			
+		
 			
 			//Change by Rohan on 7/4/12 for min shelf flag.end
 			rs = pstmtStock.executeQuery();