commiting the change for expiry stocks

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

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

@@ -591,7 +591,8 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 									
 									if("Y".equalsIgnoreCase(singleLotSl))
 									{
-										sql = "SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ?  AND LOC_CODE = ? ";
+										//sql = "SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ?  AND LOC_CODE = ? ";
+										sql = "SELECT SUM(QUANTITY) AS QUANTITY FROM STOCK WHERE SITE_CODE = ?  AND LOC_CODE = ? ";
 										pstmt = conn.prepareStatement( sql );
 										pstmt.setString( 1, siteCode );
 										pstmt.setString( 2, locCodeCurr );										
@@ -2003,7 +2004,9 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 						System.out.println("sugstLocList after ->"+sugstLocList);
 						rs = pstmt.executeQuery();
 						//Changed by sumit on 05/08/12 getting hold quantity value from inv_hold_rel_trace start.
-						sql = "SELECT SUM(HOLD_QTY) AS HOLD_QTY FROM INV_HOLD_REL_TRACE " +
+						//sql = "SELECT SUM(HOLD_QTY) AS HOLD_QTY FROM INV_HOLD_REL_TRACE " +
+						sql = "SELECT SUM((CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) + " +
+								" (CASE WHEN REL_QTY IS NULL THEN 0 ELSE REL_QTY END)) AS HOLD_QTY FROM INV_HOLD_REL_TRACE " +
 								" WHERE "+//REF_NO = ? AND " +
 								" SITE_CODE = ? " +
 								" AND ITEM_CODE = ? " +