shelf_life_type passed to stock update

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

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

@@ -954,7 +954,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		double noArt = 0, receiptQty = 0, stdRate = 0;
 
 		String lineNo = "0", itemCode = "", purcOrder = "", unit = "",locCode = "",stdUom = "", pordLine = "", cancelBo = "";
-		String exShtLoc = "", formNo = "", effectStock = "", mfgItemCode = "", invStat = "", itemSer = "";
+		String exShtLoc = "", formNo = "", effectStock = "", mfgItemCode = "", invStat = "", itemSer = "", shelfLifeType = "";
 		String lotNo = "", lotSl = "", acctCodeCR = "", acctCodeDR = "", cctCodeCR = "", cctCodeDR = "", packCode = "";
 		String suppCodeMnfr = "", siteCodeMfg = "",grade = "", batchNo = "", dutyPaid = "", uomRound = "";
 		java.sql.Timestamp mfgDate = null, retestDate = null, expiryDate = null;
@@ -1130,7 +1130,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				 + " (case when excess_short_qty is null then 0 else excess_short_qty end) as excess_short_qty, "
 				 + " loc_code__excess_short	, (case when realised_qty is null then 0 else realised_qty end) as realised_qty, "
 				 + " batch_no, no_art, item_code__mfg, std_rate, effect_stock, form_no, retest_date, "
-				 + " duty_paid, batch_size "
+				 + " duty_paid, batch_size, shelf_life__type "
 				 + " from porcpdet Where tran_id = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
@@ -1207,6 +1207,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				retestDate = rs.getTimestamp("retest_date");
 				dutyPaid = rs.getString("duty_paid");
 				batchSize = rs.getDouble("batch_size");
+				shelfLifeType = rs.getString("shelf_life__type");
 				//qcReqd = rs.getString("qc_reqd");//Gulzar this column is not present in porcpdet
 				///////////////////////////////////////////////////////////////////////////////
 				// maintain the lock list in the map as per supplier or supplieritem definition
@@ -1602,7 +1603,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					//stkUpdMap.put("pack_instr",packInstr);
 					stkUpdMap.put("batch_no",batchNo);
 					stkUpdMap.put("batch_size",Double.toString(batchSize));
-
+					stkUpdMap.put("shelf_life_type", shelfLifeType);
 					StockUpdate stkUpd =  new StockUpdate();
 					errString = stkUpd.updateStock(stkUpdMap,xtraParams,conn);
 					stkUpd =null;