Bug fixed in SalesReturnConfirm and SalesReturnVerifyPasswordPrc

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

webitm-fin/src/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java

@@ -675,8 +675,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
 								rs1 = pstmt1.executeQuery();
 								if(rs1.next())
 								{
-									itemCode = rs.getString("item_code");
-									itemSer = rs.getString("item_ser");
+								/*	itemCode = rs.getString("item_code");
+									itemSer = rs.getString("item_ser");*/
+									itemCode = rs1.getString("item_code");
+									itemSer = rs1.getString("item_ser");
 								}
 								if(rs1 != null)
 								{
@@ -815,8 +817,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
 								rs1 = pstmt1.executeQuery();
 								if(rs1.next())
 								{
-									itemCode = rs.getString("item_code");
-									itemSer = rs.getString("item_ser");
+									/*itemCode = rs.getString("item_code");
+									itemSer = rs.getString("item_ser");*///commented by monika salla- 2 march 2020-resultset taken wrong
+
+									itemCode = rs1.getString("item_code");
+									itemSer = rs1.getString("item_ser");
 								}
 								if(rs1 != null)
 								{
@@ -944,10 +949,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
 							pstmt1.setString(2,lineNo);
 							rs1 = pstmt1.executeQuery();
 							if(rs1.next())
-							{
+							{/*
 								itemCode = rs.getString("item_code");
-								itemSer = rs.getString("item_ser");
+								itemSer = rs.getString("item_ser");*///commented to change resultset by monika on 2 march 2020
+								itemCode = rs1.getString("item_code");
+								itemSer = rs1.getString("item_ser");//end
 							}
+
 							if(rs1 != null)
 							{
 								rs1.close();rs1 = null;