added validation of scheme check

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

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

@@ -4782,9 +4782,9 @@ public class PostOrderActivity {
 		ResultSet rs8=null,rs9=null; 
 		//double quentityschm =0,freeValue=0, rateschm=0 ,freequentity = 0 ,balValBfr = 0 ,balQtyBfr = 0 ,balQutAfr =0 ,balValAfr = 0 ,RembalVAl =0,RembalQty =0 ,balFreeVal = 0 ,balFreeQty=0;
 		String tranId = "" ,tranIdbal = "", invLineType = ""; // Added By PriyankaC on 7OCt2018.
-		int update = 0 ,invLineNo= 0,cnt=0; // Added By PriyankaC on 7OCt2018.
+		int update = 0 ,invLineNo= 0,cnt=0,cnt1=0; // Added By PriyankaC on 7OCt2018.
 		String sordNoschm = "",lotNoschm = "" , priceListschm ="",itemCodeschm ="" ,rtlSchmRateBase="",mrpPriceList = "" , errString = ""; // Added By PriyankaC2018
-		String stateCodeDlv="",schemeCodePur="",schemeCodeOffer="",itemCodeOrd="",sordNoDet="";//added by nandkumar gadkari on 31/05/19
+		String stateCodeDlv="",schemeCodePur="",schemeCodeOffer="",itemCodeOrd="",sordNoDet="",schemeCode1="";//added by nandkumar gadkari on 31/05/19
 		double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,totalusedpoints=0,quantityStduom=0,balFreeValue=0;//added by nandkumar gadkari on 31/05/19
 	
 		try
@@ -5120,16 +5120,16 @@ public class PostOrderActivity {
 					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)
 						{
 							if("C".equalsIgnoreCase(nature) )
 							{
 							
 								sql = "select count (*) as cnt from SCH_PUR_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()) 
@@ -5145,13 +5145,17 @@ public class PostOrderActivity {
 								{
 									continue;
 								}
+								else {
+									cnt1++;
+									schemeCode=schemeCode1;
+								}
 															
 							}
 							if("P".equalsIgnoreCase(nature) )
 							{
 								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()) 
@@ -5167,6 +5171,10 @@ public class PostOrderActivity {
 								{
 									continue;
 								}
+								else {
+									cnt1++;
+									schemeCode=schemeCode1;
+								}
 							}
 							
 						}		
@@ -5176,7 +5184,7 @@ public class PostOrderActivity {
 					rs1 = null;
 					pstmt1.close();
 					pstmt1= null;
-					if(cnt > 0)
+					if(cnt1 > 0)
 					{
 						
 						

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

@@ -1373,6 +1373,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 							}
 							if(cnt== 1)
 							{
+								cnt1++;
 								schemeCode=schemeCode1;
 							}
 							
@@ -1384,7 +1385,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 				rs1 = null;
 				pstmt1.close();
 				pstmt1= null;
-					if (cnt == 0) {
+					if (cnt1 == 0) {
 						errorString=itmDBAccessEJB.getErrorString("","VTINFEEQTY","","",conn);
 						System.out.println("invalid free quantity for this item code ");
 					}