Item code item series combination error removed for getting old rate item series added in query

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

webitm-fin/ibase/webitm/ejb/fin/StockValAdjTran.java

@@ -382,7 +382,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 									break;
 								}
 								
-								sql = "select count(1) from stock where item_code = ? and item_ser = ?";
+							   /*sql = "select count(1) from stock where item_code = ? and item_ser = ?";
 								pstmt=conn.prepareStatement(sql);
 								pstmt.setString(1,itemCode);
 								pstmt.setString(2,itemser);
@@ -401,7 +401,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 									errCode = "VTSTVALITS";
 									errString = getErrorString("item_code",errCode,userId);
 									break;
-								}
+								}*/
 							
 							  }
 						}
@@ -844,7 +844,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 		String childNodeName = null;
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		ConnDriver connDriver = new ConnDriver();
-		String siteCode = "",sql="",sitedesc="",priclit="";
+		String siteCode = "",sql="",sitedesc="",priclit="",ItemSer="";
 		int currentFormNo =0;
 		String columnValue="",chgTerm="",chgUser="",priceList="",tranDate="",listType="",oRate="",oldRateS="";
 		String itemCode="",locCode="",lotNo="",lotsl="",quantity="",itmdesc="",loginSite="";
@@ -932,6 +932,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 				System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
 				
 				siteCode = checkNull(genericUtility.getColumnValue("site_code",dom1));
+				ItemSer = checkNull(genericUtility.getColumnValue("item_ser",dom1));
 				itemCode = checkNull(genericUtility.getColumnValue("item_code",dom));
 				locCode  = checkNull(genericUtility.getColumnValue("loc_code",dom));
 				lotNo = checkNull(genericUtility.getColumnValue("lot_no",dom));
@@ -955,7 +956,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 					
 					if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
 					{
-						oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
+						oldRate=getRateFromStock(conn, siteCode, itemCode, ItemSer, locCode, lotNo, lotsl);
 						getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
 						System.out.println("Old Rate in item code----->>["+oldRate);	
 						 
@@ -1011,7 +1012,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 					{
 						
 
-						oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
+						oldRate=getRateFromStock(conn, siteCode, itemCode, ItemSer, locCode, lotNo, lotsl);
 						getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
 						System.out.println("Old Rate in item code----->>["+oldRate);	
 						 
@@ -1072,7 +1073,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 					{
 						
 
-						oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
+						oldRate=getRateFromStock(conn, siteCode, itemCode, ItemSer, locCode, lotNo, lotsl);
 						getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
 						System.out.println("Old Rate in item code----->>["+oldRate);	
 						 
@@ -1130,7 +1131,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 				{
 					if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
 					{
-						oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
+						oldRate=getRateFromStock(conn, siteCode, itemCode, ItemSer, locCode, lotNo, lotsl);
 						getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
 						System.out.println("Old Rate in item code----->>["+oldRate);	
 						
@@ -1385,20 +1386,23 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 		}
 		return input.trim();
 	}
-	public double getRateFromStock(Connection conn,String siteCode,String itemCode,String locCode,String lotNo,String lotSl){
+
+	
+	public double getRateFromStock(Connection conn,String siteCode,String itemCode,String itemSer,String locCode,String lotNo,String lotSl){
 	    ResultSet rs=null;
 		PreparedStatement pstmt=null;
 	    String sql="";
 	    int count=0;
 	    double oldRate=0;
 	    try{
-	    	sql = "select rate from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl = ?";
+	    	sql = "select rate from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? and item_ser = ? and exp_date >= sysdate";
 	    	pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1,siteCode);
 			pstmt.setString(2,itemCode);
 			pstmt.setString(3,locCode);
 			pstmt.setString(4,lotNo);
 			pstmt.setString(5,lotSl);
+			pstmt.setString(6,itemSer);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
@@ -1419,6 +1423,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
 	}
 	
 	
+	
 	public double getQuantityFromStock(Connection conn,String siteCode,String itemCode,String locCode,String lotNo,String lotSl){
 	    ResultSet rs=null;
 		PreparedStatement pstmt=null;