Updated EJB for DISC_PERS changes in getDiscount() method.

Change in sql and set DISC_PERC.


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

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

@@ -228,6 +228,7 @@ public class DistDiscount extends ValidatorEJB implements DistDiscountLocal, Dis
 	public double getDiscount(String plistDisc, java.util.Date orderDate, String custCode, String siteCode, String itemCode, String unit, double discMerge, java.util.Date plistDate, double qty, Connection connectionObject) throws RemoteException,ITMException
 	{
 
+		System.out.println("Inside getDiscount........");
 		double disc = 0;
 		double rate = 0;
 
@@ -295,7 +296,43 @@ public class DistDiscount extends ValidatorEJB implements DistDiscountLocal, Dis
 				// find in customer_series
 				sql="SELECT DISC_PERC FROM CUSTOMER_SERIES WHERE CUST_CODE='"+custCode+"' AND ITEM_SER='"+itemSer+"'";
 				rs3 = stmt.executeQuery(sql);
-				if (!rs3.next() || (disc == 0))
+				if(rs3.next())
+				{		
+					disc = rs3.getDouble(1);
+				}
+				else
+				{
+					// find in site_customer
+					sql = "SELECT DISC_PERC FROM SITE_CUSTOMER WHERE SITE_CODE = '"+siteCode+"' AND CUST_CODE='"+custCode+"'";
+					rs4 = stmt.executeQuery(sql);
+					if (rs4.next())
+					{
+						//disc = 0;
+						disc=rs4.getDouble(1);
+					}
+					else
+					{
+						//disc=rs4.getDouble(1);
+						
+						System.out.println("disc SITE_CUSTOMER......"+disc);
+						
+						// find in customer
+						sql = "SELECT DISC_PERC FROM CUSTOMER WHERE CUST_CODE='"+custCode+"'";
+						rs5 = stmt.executeQuery(sql);
+						if (!rs5.next())
+						{
+							disc = 0;
+						}
+						else
+						{
+							disc=rs5.getDouble(1);
+						}
+						
+					}
+				
+				}
+				/*System.out.println("disc. CUSTOMER_SERIES....."+disc + "rs3.next()"+rs3.next());
+				if (rs3.next() == false || (disc == 0))
 				{
 					// find in site_customer
 					sql = "SELECT DISC_PERC FROM SITE_CUSTOMER WHERE SITE_CODE = '"+siteCode+"' AND CUST_CODE='"+custCode+"'";
@@ -307,6 +344,8 @@ public class DistDiscount extends ValidatorEJB implements DistDiscountLocal, Dis
 					else
 					{
 						disc=rs4.getDouble(1);
+						
+						System.out.println("disc SITE_CUSTOMER......"+disc);
 						// find in customer
 						sql = "SELECT DISC_PERC FROM CUSTOMER WHERE CUST_CODE='"+custCode+"'";
 						rs5 = stmt.executeQuery(sql);
@@ -323,7 +362,7 @@ public class DistDiscount extends ValidatorEJB implements DistDiscountLocal, Dis
 				else
 				{
 					disc=rs3.getDouble(1);
-				}
+				}*/
 				if (listType.equalsIgnoreCase("N"))	
 				{
 					// merge with rate