Consider Hold qty in Stock table

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

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

@@ -792,22 +792,26 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				// The stock join location master and join invstat with location master inv_st, 
 				// join the location master loc_code with stock loc_code
 				{
-					sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
+					//sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
+					sql = "SELECT SUM(A.QUANTITY-CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END-CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) "
 						 +"FROM STOCK A, LOCATION L, INVSTAT B "
 						 +"WHERE L.LOC_CODE = A.LOC_CODE "
 						 + " AND L.INV_STAT  = B.INV_STAT "
 						 +"AND A.ITEM_CODE = '"+itemCode+"' "
 						 +"AND A.SITE_CODE = '"+siteCodeReq+"' "
 						 +"AND B.AVAILABLE = '"+availableYn+"' "
-						 +"AND A.QUANTITY  > 0 "
-						 +"AND A.LOC_CODE  LIKE '"+locCode+"' ";	
+						// +"AND A.QUANTITY  > 0 "
+						 +"AND A.LOC_CODE  LIKE '"+locCode+"' "
+						 +" HAVING SUM(A.QUANTITY-CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END-CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 ";
+					
 					System.out.println("locCode in query ===" + locCode );
 					
 				}
 				//Added by Chandni  shah -01/09/10
 				else 
 				{
-					sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
+					//sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
+					sql = "SELECT SUM(A.QUANTITY-CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END-CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) "
 						 +"FROM STOCK A, LOCATION L, INVSTAT B "
 						 +"WHERE L.LOC_CODE = A.LOC_CODE "
 						 + " AND L.INV_STAT  = B.INV_STAT "
@@ -816,8 +820,10 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 						  +"AND A.LOC_CODE  = '"+locCode+"' "
 						  +"AND A.LOT_NO    = '"+lotNo+"' "
 						  +"AND A.LOT_SL	 = '"+lotSl+"' "
-						  +"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
-						  +" AND B.AVAILABLE = '"+availableYn+"'";			
+					//	  +"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
+						  +" AND B.AVAILABLE = '"+availableYn+"'"
+						  +" HAVING SUM(A.QUANTITY-CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END-CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 ";
+						  
 				}//
 				System.out.println("sql :"+sql);
 				rs = stmt.executeQuery(sql);
@@ -854,7 +860,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				{
 					// The stock join location master and join invstat with location master inv_st, 
 					// join the location master loc_code with stock loc_code
-					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
+					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END -CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END), A.EXP_DATE, A.UNIT, "
 						  +"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, " 
 						  +"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE, a.qty_per_art as QTY_PER_ART "  
 						  +"FROM STOCK A, LOCATION L, INVSTAT B "
@@ -863,7 +869,8 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 						  +"AND A.ITEM_CODE = '"+itemCode+"' "
 						  +"AND A.SITE_CODE = '"+siteCodeReq+"' "
 						  +"AND B.AVAILABLE = '"+availableYn+"' "
-						  +"AND A.QUANTITY - A.ALLOC_QTY > 0 "
+						 // +"AND A.QUANTITY - A.ALLOC_QTY > 0 "
+						  +"AND A.QUANTITY - CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END -CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END > 0 "
 						  +"AND A.LOC_CODE  LIKE '"+locCode+"' "			
 						  +"ORDER BY A.EXP_DATE, A.LOT_NO, A.LOT_SL ";
 				}
@@ -871,7 +878,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				else 
 				{
 					
-					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
+					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END -CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END), A.EXP_DATE, A.UNIT, "
 						  +"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, " 
 						  +"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE, a.qty_per_art as QTY_PER_ART "  
 						  +"FROM STOCK A, LOCATION L, INVSTAT B "
@@ -882,7 +889,8 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 						  +"AND A.LOC_CODE  = '"+locCode+"' "
 						  +"AND A.LOT_NO    = '"+lotNo+"' "
 						  +"AND A.LOT_SL	 = '"+lotSl+"' "
-						  +"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
+						  //+"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
+						  +"AND (A.QUANTITY - CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END -CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) >="+quantity
 						  +" AND B.AVAILABLE = '"+availableYn+"'";			
 				}//
 				System.out.println("sql :"+sql);