Some minor changes and mistakes fixed

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

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

@@ -2444,6 +2444,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										|| "S".equalsIgnoreCase(nature)) || (schAttr.trim().equalsIgnoreCase("Y") && discount > 0) && (!lbOrdFlag)) {
 									schemeCode = getSchemeCode(dom, dom1, dom2, "quantity", conn);
 
+									//------Commented and added alias to get proper data by Jaffar S on 07-02-2019
+									//sql = "select CASE when scheme_flag is null then 'Q' ELSE scheme_flag END from bom where bom_code = ?";
 									sql = "select CASE when scheme_flag is null then 'Q' ELSE scheme_flag END as scheme_flag from bom where bom_code = ?";
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, schemeCode);
@@ -15577,6 +15579,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					pstmt2.setString(6, countCodeDlv);
 					rs2 = pstmt2.executeQuery();// missing executeQuery and pstmt2 rs2 added  by Nandkumar Gadkari on 03/10/18
 					while (rs2.next()) {
+						//schemeCode = rs.getString("scheme_code"); //Commented & changed to rs2 by Jaffar S
 						schemeCode = rs2.getString("scheme_code");
 						
 						String prodSh1 = "N";
@@ -15598,7 +15601,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							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(2, schemeCode);
+							//pstmt.setString(2, schemeCode);//Commented and correction made by Jaffar S on 07-02-19
+							pstmt.setString(2, itemCodeOrd);
 							rs = pstmt.executeQuery();
 
 							if (rs.next()) 
@@ -15726,7 +15730,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					pstmt.setString(1, siteCode);
 					pstmt.setString(2, custCode);
 					pstmt.setString(3, itemCodeParent);
-					pstmt.setString(4, schemeCode1);
+					pstmt.setString(4, schemeCode);
 					pstmt.setTimestamp(5, orderDate);
 					rs = pstmt.executeQuery();
 					if (rs.next()) {
@@ -15950,7 +15954,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					sql = "Select count(1) From bom Where bom_code = ? And  ? between case when min_qty is null then 0 else min_qty end"
 							+ " And case when max_qty is null then 0 else max_qty end";
 					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1, schemeCode1);
+					pstmt.setString(1, schemeCode);
 					//pstmt.setDouble(1, chargeQty);--------Commented & fixed by Jaffar S on 30-01-19 (Same parameter Index was set from beginning)
 					pstmt.setDouble(2, chargeQty);
 					rs = pstmt.executeQuery();
@@ -15971,7 +15975,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 								.println("Chargeable quantity of group of items is not eligible for the free quantity");
 					}
 					sql = "select bom.batch_qty,bomdet.qty_per,bomdet.min_qty,bomdet.app_min_qty,bomdet.app_max_qty,bomdet.round,bomdet.round_to from bom, bomdet where bom.bom_code = bomdet.bom_code and	bomdet.bom_code = ? and	bomdet.nature	= ?";
-					pstmt.setString(1, schemeCode1);
+					pstmt = conn.prepareStatement(sql);//---Added by Jaffar S, Missing line on 07-02-19
+					pstmt.setString(1, schemeCode);
 					//pstmt.setString(1, nature);--------Commented & fixed by Jaffar S on 30-01-19 (Same parameter Index was set from beginning)
 					pstmt.setString(2, nature);
 					rs = pstmt.executeQuery();