Request Id - D17IBAS002 changes in valDataGroupScheme

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

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

@@ -15017,11 +15017,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 							/// Nandkumar
 							rate1 = checkDoubleNull(genericUtility.getColumnValueFromNode("rate", currDetail1));
-							System.out.println("rate1: ====" + rate1 + "]lineNo" + lineNo + "");
+							System.out.println("rate1: ====" + rate1 + "]lineNo" + lineNo + "quantity1"+quantity);
 							//
 							System.out.println("currLineNo: ====" + currLineNo + "]lineNo" + lineNo + "");
 							//nandkumar
-							if (!currLineNo.equalsIgnoreCase(lineNo) && schAttr.trim().equalsIgnoreCase("Y") && (schemeType != 2) ) {
+							if (!currLineNo.trim().equalsIgnoreCase(lineNo.trim()) && schAttr.trim().equalsIgnoreCase("Y") && (schemeType != 2) ) {
 								System.out.println("Insideif00000forSchemeType_0andSchemeType1 ");
 								cnt = 0;
 								sql1 = "select product_code from item where item_code = ?";
@@ -15158,7 +15158,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							
 							// nandkumar-----------start----------------for sch type 2
 							
-							if (!currLineNo.equalsIgnoreCase(lineNo) && schAttr.trim().equalsIgnoreCase("Y") && schemeType == 2 ) {
+							if (!currLineNo.trim().equalsIgnoreCase(lineNo.trim()) && schAttr.trim().equalsIgnoreCase("Y") && schemeType == 2 ) {
 								System.out.println("Inside if schemetype2validation:::::");
 								cnt = 0;
 								sql1 = "select product_code from item where item_code = ?";
@@ -15234,6 +15234,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										System.out.println("insideitemCodewithoutproductC: ====" + browItemCode + "");
 										if (nature.equals("C")) {
 											prvFreeQty = prvFreeQty + quantity;
+											System.out.println(
+													"prvFreeQty insdie F" + prvFreeQty + "prvChargeQty" + prvChargeQty + "]");
 
 										}
 										System.out.println(
@@ -15579,7 +15581,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 							// Nandkumar ------------Start
 							
-							chargeQty1 = unConfTotChargeQty + chargeTotamt + totChargeQty + ConfTotChargeQty;
+							/*chargeQty1 = unConfTotChargeQty + chargeTotamt + totChargeQty + ConfTotChargeQty;*/
 
 							System.out.println("Rate is:" + rate);
 
@@ -15587,9 +15589,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 							System.out.println("prvRate @>>>>>>>>" + prvRate + "]");
 
-							/*chargeQty = unConfTotChargeQty + prvChargeQty + totChargeQty + ConfTotChargeQty;
+							chargeQty = unConfTotChargeQty + prvChargeQty + totChargeQty + ConfTotChargeQty;
 
-							chargeQty1 = chargeQty * prvRate;*/
+							//chargeQty1 = chargeQty * prvRate;
 
 							System.out.println("chargeQty @>>>>>>>>" + chargeQty1 + "]");
 
@@ -15630,11 +15632,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							rs.close();
 							pstmt = null;
 							rs = null;
-
-							if (chargeQty1 > 0) {
+							System.out.println("sch_allowence" + schAllowence + "purc_base"+purcBase);
+							if (chargeQty > 0) {
 								// freeQty = (chargeQty * rate * schAllowence / purcBase);
 
-								freeQty = (chargeQty1 * schAllowence / purcBase);
+								freeQty = (chargeQty * schAllowence / purcBase);
 							}
 							System.out.println("chargeQty  after code excuting FOR SCHEME TYPE 2 " + chargeQty + "]");
 							System.out.println("Calcurate free Qty FOR SCHEME TYPE 2 " + freeQty + "]");