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

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

@@ -2536,7 +2536,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					//	-------------------------------------------------------------------------------------------
 						
 						double  totFreeQty = 0,	unConfTotFreeQty = 0 , freeQty = 0,	prvFreeQty = 0,  rate1 = 0,qty=0.0,mRate = 0.00,value=0.0,valueAmount=0.0;
-						String  lineNo = "", browItemCode = "",	currLineNo = "",ldtDateStr = "",lsPriceList = "",retlSchmRateBase="",lsUnit="",lsListType="",lsRefNo="";
+						String  lineNo = "", browItemCode = "",	currLineNo = "",ldtDateStr = "",lsPriceList = "",retlSchmRateBase="",lsUnit="",lsListType="",lsRefNo="",schemeCode1="";
 						Timestamp  ldtPlDate = null,ldPlistDate = null;
 						int llPlcount=0;
 						
@@ -3090,13 +3090,13 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 								pstmt1.setString(6, "Y");
 								rs1 = pstmt1.executeQuery();
 								while (rs1.next()) {
-									schemeCode = rs1.getString("scheme_code");
+									schemeCode1 = rs1.getString("scheme_code");
 								
-									if(schemeCode !=null && schemeCode.trim().length() > 0)
+									if(schemeCode1 !=null && schemeCode1.trim().length() > 0)
 									{
 									sql = "select count (*) as cnt from SCH_OFFER_ITEMS  where SCHEME_CODE =? and item_code=?";
 											pstmt = conn.prepareStatement(sql);
-											pstmt.setString(1, schemeCode);
+											pstmt.setString(1, schemeCode1);
 											pstmt.setString(2, itemCodeOrd);
 											rs = pstmt.executeQuery();
 											if (rs.next()) 
@@ -3118,6 +3118,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 												errList.add(errCode);
 												errFields.add(checkNull(" ".toLowerCase()));
 											}
+											if(cnt== 1)
+											{
+												cnt1++;
+												schemeCode=schemeCode1;
+											}
 											
 											
 									}		
@@ -3127,7 +3132,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 								rs1 = null;
 								pstmt1.close();
 								pstmt1= null;
-									if (cnt == 0) {
+									if (cnt1 == 0) {
 										errCode = "VTINFEEQTY";// Scheme is not applicable for the
 										errList.add(errCode);
 										System.out.println("errList" + errList + "]");