set holt qty and GTIN in brow window

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

webitm-dis/ibase/webitm/ejb/dis/StockAllocationPrc.java

@@ -51,6 +51,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 	String sDateTo = null;
 	String sDateFr = null;
 	double balStockQty = 0;
+	double holdQty = 0;
 
 	java.sql.Timestamp dateTo =  null;
 	java.sql.Timestamp dueDate =  null;
@@ -275,7 +276,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+"SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC PENDING_QUANTITY,"
 				+"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
 				+"SORDER.SITE_CODE__SHIP,SORDITEM.EXP_LEV , "
-				+"CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG END "// ADDED BY AKHILESH FOR NEW COLUNM
+				+"CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG END, "// ADDED BY AKHILESH FOR NEW COLUNM
+				+" ITEM.GTIN_CASE  "   //added by Kunal on 22/10/12 
 				+"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM  "
 				+"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
 				+"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
@@ -283,6 +285,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+"( SORDITEM.ITEM_CODE = ITEM.ITEM_CODE ) AND "
 				+"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND  "
 				+"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
+				
 				+" SORDER.SITE_CODE = ? AND "
 				+" ITEM.ITEM_SER >=? AND "
 				+" ITEM.ITEM_SER <=? AND "  
@@ -295,7 +298,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				+" SORDITEM.ITEM_CODE >= ? AND "
 				+" SORDITEM.ITEM_CODE <= ?  " 
 				+"AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
-				+"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end = 'P' " 
+				+"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end  IN ('P','H') "  //change done by Kunal on 22/10/12 as per S Manoharan instruction ,consider Hold status  
 				+"AND SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 "
 				+"AND SORDITEM.LINE_TYPE = 'I' "
 				+"ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
@@ -330,7 +333,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					}
 					else
 					{
-						sql ="SELECT SUM(STOCK.QUANTITY - STOCK.ALLOC_QTY ) " 
+						sql ="SELECT SUM(STOCK.QUANTITY - STOCK.ALLOC_QTY ),SUM(STOCK.HOLD_QTY ) " 
 							+"FROM STOCK,ITEM,LOCATION,INVSTAT " 
 							+"WHERE (ITEM.ITEM_CODE = STOCK.ITEM_CODE) "
 							+"AND (LOCATION.LOC_CODE = STOCK.LOC_CODE ) "
@@ -344,6 +347,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						{
 							bappend = true;
 							balStockQty = rs1.getDouble(1);
+							holdQty = rs1.getDouble(2); //added by Kunal on 22/10/12 
 							if (balStockQty > 0)
 							{
 								itemCodeMap.put(rs.getString(6),new Double(rs1.getDouble(1)));
@@ -431,6 +435,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 
 						//Hold Flag
 						retTabSepStrBuff.append(rs.getString(14)).append("\t");// ADDED BY AKHILESH
+						//Hold Qty
+						retTabSepStrBuff.append(holdQty).append("\t");// added by Kunal on 22/10/12
+						//Gtin Case
+						retTabSepStrBuff.append(rs.getDouble(15)).append("\t");// added by Kunal on 22/10/12
 						//qty allocated
 						retTabSepStrBuff.append(rs.getDouble(10)).append("\t");// ADDED BY AKHILESH