add extra condition for get stock data

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

webitm-dis/ibase/webitm/ejb/dis/adv/InvHoldRelConf.java

@@ -230,7 +230,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 					sqlSelStck = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, QTY_PER_ART, HOLD_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? " ;
 					pSelStock = conn.prepareStatement(sqlSelStck);
 					
-					sqlSelTrace = "SELECT SUM( HOLD_QTY ) AS HOLD_QTY_TRACE, SUM( REL_QTY ) AS REL_QTY_TRACE FROM INV_HOLD_REL_TRACE WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? " ;
+					sqlSelTrace = "SELECT SUM( case when HOLD_QTY is null then 0 else HOLD_QTY end  ) AS HOLD_QTY_TRACE, SUM( case when REL_QTY is null then 0 else REL_QTY end  ) AS REL_QTY_TRACE FROM INV_HOLD_REL_TRACE WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? " ;
 					pSelTrace = conn.prepareStatement(sqlSelTrace);
 					
 					sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, REL_QTY, LOCK_CODE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
@@ -368,6 +368,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 							{
 								HashMap pkKeyValMap = new HashMap();	
 								StringBuffer sb = new StringBuffer("SELECT ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,QUANTITY, HOLD_QTY, QTY_PER_ART FROM STOCK WHERE ");
+								sb.append(" ( ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL ) in (select ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL from INV_HOLD_DET  where  tran_id='"+tranIdHold+"') and STOCK.QUANTITY > 0 and STOCK.HOLD_QTY > 0  and ") ;//ADDED BY KUNAL ON 27/MAY/14 add extra condition for data filter
 								ArrayList pkList = new ArrayList();
 
 								if ( itemCode != null && itemCode.length() > 0 )