UPDATED FOR ALLOCATED COLUMN BUTTON

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

webitm-stkhelp/stockhelp/ibase/webitm/ejb/dis/StockHelp.java

@@ -245,7 +245,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
 			sql = "SELECT  stock.site_code ,site.descr ,stock.item_code ,item.descr ,stock.loc_code , "
 			+" stock.lot_no ,stock.lot_sl ,location.inv_stat ,stock.retest_date ,stock.exp_date ,"
 			+" sum(stock.quantity) qty,sum(stock.alloc_qty) alloc_qty,invstat.available ,stock.unit , "
-			+" stock.potency_perc , stock.partial_used, stock.batch_no ,stock.dimension ,stock.supp_code__mfg , ";
+			+" stock.potency_perc , stock.partial_used, stock.consider_allocate, stock.batch_no ,stock.dimension ,stock.supp_code__mfg , ";
 			if((CommonConstants.DB_NAME).equalsIgnoreCase("mssql"))
 			{
 				sql = sql + " dbo.fn_ppo_qty('"+siteCode+"','"+itemCode+"') as ppo_qty,dbo.fn_pind_qty('"+siteCode+"','"+itemCode+"') as pind_qty,stock.pack_code , ";
@@ -268,7 +268,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
 			+" and ( stock.quantity <> 0 ) "
 			+" GROUP BY stock.site_code ,site.descr ,stock.item_code ,item.descr ,stock.loc_code , "
 			+" stock.lot_no ,stock.lot_sl ,location.inv_stat ,invstat.available ,stock.retest_date , "
-			+" stock.exp_date ,stock.unit ,stock.potency_perc ,stock.partial_used ,stock.batch_no ,stock.dimension , "
+			+" stock.exp_date ,stock.unit ,stock.potency_perc ,stock.partial_used ,stock.consider_allocate ,stock.batch_no ,stock.dimension , "
 			+" stock.supp_code__mfg ,stock.pack_code ,stock.qty_per_art , "
 			+" stock.batch_size, stock.mfg_date, stock.no_art, stock.rate,stock.pack_ref  "
 			+" ORDER BY stock.site_code ASC, stock.item_code ASC, "
@@ -328,14 +328,14 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
 				thisBean.expDate = rs.getString(10) == null ? "" : genericUtility.getValidDateString(rs.getString(10),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
 				thisBean.quantity = rs.getDouble(11);
 				thisBean.allocQuant = rs.getDouble(12);
-				if(thisBean.allocQuant == 0 || thisBean.allocQuant == 0.0)
-				{
-					thisBean.allocQuantLable = "N";
-				}
-				else
-				{
-					thisBean.allocQuantLable = "Y";
-				}
+//				if(thisBean.allocQuant == 0 || thisBean.allocQuant == 0.0)
+//				{
+//					thisBean.allocQuantLable = "N";
+//				}
+//				else
+//				{
+//					thisBean.allocQuantLable = "Y";
+//				}
 				thisBean.available = rs.getString(13);
 				thisBean.unit = rs.getString(14);
 				thisBean.potencyPerc = rs.getString(15);  
@@ -348,19 +348,21 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
 				{
 					thisBean.partialused  = "Yes";
 				}
-				thisBean.batchNo = rs.getString(17);
-				thisBean.dimention = rs.getString(18);
-				thisBean.suppCodeMfg = rs.getString(19);
-				thisBean.ppoQty = rs.getString(20);
-				thisBean.pindQty = rs.getString(21);
-				thisBean.packCode = rs.getString(22);
-				thisBean.qtyPerArt = rs.getString(23);
-				thisBean.batchSize = rs.getString(24);
-				thisBean.holdQuant = rs.getDouble(25);
-				thisBean.mfgDate = rs.getString(26) == null ? "" : genericUtility.getValidDateString(rs.getString(26),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
-				thisBean.noArt = rs.getString(27); //Changed By Dipak Chattar On 15 Nov 2011
-				thisBean.rate = rs.getString(28);
-				thisBean.packRef = rs.getString(29);//added By Swati Bade On 09 May 2013
+				thisBean.allocQuantLable = rs.getString(17);
+				
+				thisBean.batchNo = rs.getString(18);
+				thisBean.dimention = rs.getString(19);
+				thisBean.suppCodeMfg = rs.getString(20);
+				thisBean.ppoQty = rs.getString(21);
+				thisBean.pindQty = rs.getString(22);
+				thisBean.packCode = rs.getString(23);
+				thisBean.qtyPerArt = rs.getString(24);
+				thisBean.batchSize = rs.getString(25);
+				thisBean.holdQuant = rs.getDouble(26);
+				thisBean.mfgDate = rs.getString(27) == null ? "" : genericUtility.getValidDateString(rs.getString(27),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
+				thisBean.noArt = rs.getString(28); //Changed By Dipak Chattar On 15 Nov 2011
+				thisBean.rate = rs.getString(29);
+				thisBean.packRef = rs.getString(30);//added By Swati Bade On 09 May 2013
 				
 				thisBean.currDateTs = getCurrdateTimestmp();
 				avl = thisBean.quantity - thisBean.allocQuant;