changes made for getting rate slab no wise

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

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

@@ -10922,18 +10922,14 @@ public class DistCommon {
 		{
 			rate = 0;
 			try {// try 1
+				// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [start]
 				if(lsRefNo == null || lsRefNo.trim().length() == 0)
 				{
 					String slabNo = getMaxSlabNo(priceList, tempDate, itemCode, lsRefNo, listType,quantity, conn);
-					sql = "SELECT RATE,lot_no__from FROM PRICELIST "
-							+ "WHERE PRICE_LIST = '" + priceList + "' "
-							+ "AND ITEM_CODE = '" + itemCode + "' "
-							+ "AND LIST_TYPE = 'B'" + " and slab_no ='" + slabNo
-							+ "' " + "AND MIN_QTY <= " + quantity + " "
-							+ "AND MAX_QTY >= " + quantity + " "
-							+ "AND EFF_FROM <= ? " + "AND VALID_UPTO >= ?";
+					sql = "SELECT RATE,LOT_NO__FROM FROM PRICELIST WHERE PRICE_LIST = '" + priceList + "' AND ITEM_CODE = '" + itemCode + "' AND LIST_TYPE = 'B'" + " and slab_no ='" + slabNo + "' " + "AND MIN_QTY <= " + quantity + " AND MAX_QTY >= " + quantity + " AND EFF_FROM <= ? " + "AND VALID_UPTO >= ?";
 					pstmt = conn.prepareStatement(sql);
 				}
+				// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [end]
 				else
 				{
 					sql = "SELECT RATE,lot_no__from FROM PRICELIST "
@@ -10985,30 +10981,14 @@ public class DistCommon {
 						}
 						if (priceListParent.trim().length() > 0) {
 							try {// try 3
+								// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [start]
 								if(lsRefNo == null || lsRefNo.trim().length() == 0)
 								{
 									String slabNo = getMaxSlabNo(priceList, tempDate, itemCode, lsRefNo, listType,quantity, conn);
-									sql = "SELECT RATE,lot_no__from FROM PRICELIST "
-											+ "WHERE PRICE_LIST = '"
-											+ priceListParent
-											+ "' "
-											+ "AND ITEM_CODE = '"
-											+ itemCode
-											+ "' "
-											+ "AND LIST_TYPE = 'B'"
-											+ " and slab_no ='"
-											+ slabNo
-											+ "' "
-											+ "AND MIN_QTY <= "
-											+ quantity
-											+ " "
-											+ "AND MAX_QTY >= "
-											+ quantity
-											+ " "
-											+ "AND EFF_FROM <= ? "
-											+ "AND VALID_UPTO >= ?";
+									sql = "SELECT RATE,LOT_NO__FROM FROM PRICELIST WHERE PRICE_LIST = '" + priceListParent + "' AND ITEM_CODE = '" + itemCode + "' AND LIST_TYPE = 'B' AND SLAB_NO = '" + slabNo + "' AND MIN_QTY <= " + quantity + " AND MAX_QTY >= " + quantity + " AND EFF_FROM <= ? AND VALID_UPTO >= ?";
 									pstmt = conn.prepareStatement(sql);
 								}
+								// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [end]
 								else
 								{
 									sql = "SELECT RATE,lot_no__from FROM PRICELIST "
@@ -12294,8 +12274,8 @@ public class DistCommon {
 	}
 	
 	//Added by Anjali R. on[13/04/2018][To parse string value into double][End]
-	private String getMaxSlabNo(String priceList, String trDate, String itemCode, String aRefNo, String listType, double quantity, Connection conn)
-		    throws Exception
+	// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [start]
+	private String getMaxSlabNo(String priceList, String trDate, String itemCode, String aRefNo, String listType, double quantity, Connection conn) throws Exception
 	{
 	    String slabNumber = "";
 	    String sql = "";
@@ -12351,4 +12331,5 @@ public class DistCommon {
 	    }
 	    return slabNumber;
 	}
+	// added by rupali on 30/04/19 for getting rate slab_no wise if ref_no is geting blank [end]
 }// class