Issue tracker no 265

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

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

@@ -1891,9 +1891,10 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 				}
 				cntList++;
 			}
-			//Changed by ameya on 14/09/2012 End
 			
-			System.out.println(" invStstPars -----> ["+invStstPars+"]");
+			// Changed by sankara on 27/08/13 for optimized the sql start.
+			//Changed by ameya on 14/09/2012 End
+			/*System.out.println(" invStstPars -----> ["+invStstPars+"]");
 			sql = "SELECT A.LOC_CODE AS LOC_CODE, A.LOC_TYPE AS LOC_TYPE FROM LOCATION A, INVSTAT B "
 				+ " WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' "
 				+ " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
@@ -1908,7 +1909,15 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 			stockSql = "SELECT SUM(CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) AS STOCK_QTY "
 					+  " FROM STOCK WHERE LOC_CODE = ? ";
 		
-			pstmtStock =  conn.prepareStatement(stockSql);
+			pstmtStock =  conn.prepareStatement(stockSql);*/
+			
+			sql =  " SELECT LOC_CODE, LOC_ZONE, LOC_TYPE FROM ( SELECT A.LOC_CODE AS LOC_CODE, A.LOC_ZONE AS LOC_ZONE, A.LOC_TYPE AS LOC_TYPE " +
+			   " FROM LOCATION A, INVSTAT B , STOCK S WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " +
+			   " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+			   " AND S.INV_STAT = A.INV_STAT AND S.INV_STAT = B.INV_STAT AND S.LOC_CODE = A.LOC_CODE AND  A.LOC_TYPE = ? AND A.INV_STAT IN ("+invStstPars+") " +
+			   " GROUP BY A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE HAVING SUM (CASE WHEN S.QUANTITY IS NULL THEN 0 ELSE S.QUANTITY END) < = 0 ) " +
+			   " ORDER BY ABS(LOC_ZONE - ?), LOC_CODE " ;
+			// Changed by sankara on 27/08/13 for optimized the sql end.	
 
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1, locType);
@@ -1931,11 +1940,13 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 			//Changed by ameya on 14/09/2012 End
 			
 			rs = pstmt.executeQuery();
-			while (rs.next())
+			//while (rs.next())
+			if (rs.next())
 			{
 				resvLocCode = checkNull(rs.getString("LOC_CODE") );
 				locType = checkNull(rs.getString("LOC_TYPE") );
-				pstmtStock.setString( 1, resvLocCode );
+				
+				/*pstmtStock.setString( 1, resvLocCode );
 				rsStock = pstmtStock.executeQuery();
 				if ( rsStock.next() )
 				{
@@ -1950,10 +1961,10 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 					}
 				}
 				pstmtStock.clearParameters();
-				rsStock.close(); rsStock = null;
+				rsStock.close(); rsStock = null;*/
 			}
 			
-			pstmtStock.close(); pstmtStock = null;			
+			//pstmtStock.close(); pstmtStock = null;			
 		}
 		catch(Exception e)
 		{
@@ -1963,7 +1974,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 		{
 			try
 			{
-				if (rsStock != null)
+				/*if (rsStock != null)
 				{
 					rsStock.close();
 					rsStock = null;
@@ -1972,7 +1983,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 				{
 					pstmtStock.close();
 					pstmtStock = null;
-				}
+				}*/
 				if (rs != null)
 				{
 					rs.close();

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

@@ -3821,6 +3821,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						isMasterPickChecked = (String)mapData.get("isMasterPickChecked");
 						isStockToDockChecked = (String)mapData.get("isStockToDockChecked");
 						isParcelPickChecked = (String)mapData.get("isParcelPickChecked");
+						shipTypeLine = (String)mapData.get("ship_type");
 						expLev = (String)mapData.get("expLev");
 						waveFlag = "";
 						String lineNoSord = lineNo;
@@ -21176,8 +21177,8 @@ private String printExceptionMessage( String Code, Connection conn, String errSt
 		errMessage =  new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
 		String begPart = errMessage.substring(0,errMessage.indexOf("<message>")+9);
 		System.out.println("BEGPART===="+begPart);
-	//	String endDesc = errMessage.substring(errMessage.indexOf("</description>"));
-		if(errString.indexOf("<description>") != -1 && errString.indexOf("</description>") != -1)
+		//String endDesc = errMessage.substring(errMessage.indexOf("</description>"));
+		if(errString != null && errString.indexOf("<description>") != -1 && (errString.indexOf("</description>") + 14) != -1)
 		{
 			endDesc = errString.substring(errString.indexOf("<description>"),errString.indexOf("</description>")+14);
 		}