shelf_life_type taken from stock map for updating in item_lot_info

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

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

@@ -36,6 +36,7 @@ public class StockUpdate
 	Timestamp lastPhycDate=null,tranDate= null,retestDate =null;
 	String suppCode="";  // added by cpatil
 	String chgTerm="",chgUser="";        // added by cpatil
+	String shelfLifeType = ""; // 26/02/14 manoharan
 	//
 	String considerAllocate = "Y",	partialUsed = "";
 	//
@@ -1755,6 +1756,11 @@ public class StockUpdate
     		{
     			this.lotSlOrg = 	updateStockMap.get("lot_sl__org").toString();
     		}
+    		if(updateStockMap.get("lot_sl__org")!=null)
+    		{
+    			this.shelfLifeType = 	updateStockMap.get("shelf_life_type").toString();
+    		}
+			
 
         }catch(Exception e){
             System.out.println("Exception "+e);
@@ -2489,7 +2495,8 @@ public class StockUpdate
        String sql="",errCode="",sql2="";
        ResultSet rs=null, rs2=null;
        PreparedStatement pstmt=null, pstmt2=null;
-       String shelfLifeType="",lotNo="",itemCode="",grade="",stkOpt="";
+       //String shelfLifeType=""
+	   String lotNo="",itemCode="",grade="",stkOpt="";
        int cnt=0,cnt1=0;
        Timestamp expDate=null , mfgDate=null, retestDate=null ,retestDate_upd3=null;
        //Date today=null;
@@ -2753,6 +2760,10 @@ public class StockUpdate
     		{
     			this.suppCode = updateStockMap.get("supp_code").toString();
     		}
+    		if(updateStockMap.get("shelf_life_type")!=null)
+    		{
+    			this.shelfLifeType = updateStockMap.get("shelf_life_type").toString();
+    		}
     		
 
     		stkOpt = checkStkOpt(this.itemCode,this.siteCode,conn);
@@ -2760,20 +2771,21 @@ public class StockUpdate
     		
 			if( "2".equalsIgnoreCase(stkOpt))
 			{	                     
-				         //Change shelf_life_type TO shelf_life__type.  CHANGE DONE  BY RITESH TIWARI ON 15/11/13
-				 sql = " select shelf_life__type from item where item_code = ?  ";
+				 //Change shelf_life_type TO shelf_life__type.  CHANGE DONE  BY RITESH TIWARI ON 15/11/13
+				/* sql = " select shelf_life__type from item where item_code = ?  ";
 		           pstmt = conn.prepareStatement(sql);
 		   		   pstmt.setString(1,this.itemCode);
 		   		   rs = pstmt.executeQuery();
 		           if(rs.next())
 		           {
-		        	  shelfLifeType = rs.getString(1);
+		        	  this.shelfLifeType = rs.getString(1);
 		           	  System.out.println("@@@@ shelfLifeType:"+shelfLifeType);
 		           }
 		           rs.close();
 		   		   rs = null;
 		   		   pstmt.close();
 		   		   pstmt = null;
+				*/
 		   		   
 		   sql = " select count (*) from item_lot_info where item_code = ? and lot_no = ? ";
            pstmt = conn.prepareStatement(sql);
@@ -2817,7 +2829,7 @@ public class StockUpdate
                 	 batchNo  	 = rs.getString("batch_no");
                 	 batchSize 	 = rs.getDouble("batch_size");
                 	 suppCodeMfg   = rs.getString("supp_code__mfg");
-                	 shelfLifeType = rs.getString("shelf_life_type");
+                	 this.shelfLifeType = rs.getString("shelf_life_type");
                 	 suppCode = rs.getString("supp_code");
                 	 
                  }
@@ -3141,8 +3153,9 @@ public class StockUpdate
 				pstmt.setString(15,updateStockMap.get("batch_no")==null?null:updateStockMap.get("batch_no").toString());
 				pstmt.setString(16,updateStockMap.get("batch_size")==null?null:updateStockMap.get("batch_size").toString());
 				pstmt.setString(17,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code__mfg").toString());
-				pstmt.setString(18,shelfLifeType);
+				pstmt.setString(18,this.shelfLifeType);
 				pstmt.setString(19,updateStockMap.get("supp_code")==null?null:updateStockMap.get("supp_code").toString());
+				
 				pstmt.setTimestamp(20,today);
 				//pstmt.setDate(20,today);
 				pstmt.setString(21,chgTerm);