Check list type of pricelist on update or insert

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

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

@@ -3298,13 +3298,33 @@ public class SalesQuotProposal extends ValidatorEJB implements SalesQuotProposal
 		String refNo = "", refOldNo = "", orderType = "", chgRefNo = "";
 		String minQty = "", maxQty = "", rate = "", maxRate = "", minRate ="";
 		Timestamp validDate = null;
-		String priceSql = "SELECT MAX(SLAB_NO) as SLAB_NO FROM PRICELIST WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND UNIT = ?";
+		
+		//Added by AMOL on 06-11-18 START
+		String listTypeSql = "SELECT LIST_TYPE FROM PRICELIST_MST WHERE PRICE_LIST = ?";
+		try 
+		{
+			pStmt = connection.prepareStatement(listTypeSql);
+			pStmt.setString(1, priceList);
+			resultSet = pStmt.executeQuery();
+			while(resultSet.next()) 
+			{
+				listType = resultSet.getString("LIST_TYPE");
+			}
+			close(resultSet, pStmt);
+		}
+		catch(Exception e) 
+		{
+			System.out.println("#### Exxception in updatePriceList :: listTypeSql :"+e);
+		}
+		//Added by AMOL on 06-11-18 END
+		System.out.println("######## ListType ["+listType+"]");
+		String priceSql = "SELECT MAX(SLAB_NO) as SLAB_NO FROM PRICELIST WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND LIST_TYPE = ?";
 		try 
 		{
 			pStmt = connection.prepareStatement(priceSql);
 			pStmt.setString(1, priceList);
 			pStmt.setString(2, itemCode);
-			pStmt.setString(3, unit);
+			pStmt.setString(3, listType);
 			resultSet = pStmt.executeQuery();
 			if(resultSet.next())
 			{
@@ -3314,20 +3334,21 @@ public class SalesQuotProposal extends ValidatorEJB implements SalesQuotProposal
 			
 			System.out.println("#### PRICE_LIST "+priceList);
 			System.out.println("#### itemCode "+itemCode);
-			System.out.println("#### unit "+unit);
+			System.out.println("#### listType "+listType);
 			System.out.println("#### MAX Slab No "+slabNo);
 			
-			String validUptoSql = "SELECT * FROM PRICELIST WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND UNIT = ? and slab_no = ?";
+			String validUptoSql = "SELECT * FROM PRICELIST WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND LIST_TYPE = ? and slab_no = ?";
 			sPstmt = connection.prepareStatement(validUptoSql);
 			sPstmt.setString(1, priceList);
 			sPstmt.setString(2, itemCode);
-			sPstmt.setString(3, unit);
+			sPstmt.setString(3, listType);
 			sPstmt.setInt(4, slabNo);
 			sRst = sPstmt.executeQuery();
 			if(sRst.next())
 			{
+				System.out.println("#### In result Set ...");
 				validDate = sRst.getTimestamp("VALID_UPTO");
-				listType = sRst.getString("LIST_TYPE");
+				//listType = sRst.getString("LIST_TYPE");
 				lotNoFrom = sRst.getString("LOT_NO__FROM");
 				lotNoTo = sRst.getString("LOT_NO__TO");
 				minQty = sRst.getString("MIN_QTY");
@@ -3342,28 +3363,42 @@ public class SalesQuotProposal extends ValidatorEJB implements SalesQuotProposal
 				refNo = sRst.getString("REF_NO");
 				refOldNo = sRst.getString("REF_NO_OLD");
 			}
-			
+			System.out.println("#### After result Set ...");
 			close(sRst,sPstmt);
-			
-			
+			try
+			{
+				System.out.println("#### In try  ...");
 				Calendar cal = Calendar.getInstance();
+				System.out.println("#### 111111  ...");
 				Calendar currDate = Calendar.getInstance();
+				System.out.println("#### 222222  ...");
 				currDate.setTimeInMillis(new Date().getTime());
-			
+				System.out.println("#### 333333  ...");
 				currDate.set(Calendar.HOUR_OF_DAY, 0);
+				System.out.println("#### 44444  ...");
 				currDate.set(Calendar.HOUR, 0);
+				System.out.println("#### 55555  ...");
 				System.out.println("currDate : "+currDate.getTime());
+				System.out.println("#### In 6666  ...");
 				cal.setTimeInMillis(validDate.getTime());
+				System.out.println("#### In 77777  ...");
 				cal.add(Calendar.DAY_OF_MONTH, -1);
+				System.out.println("#### In 8888...");
 				validDate = new Timestamp(cal.getTime().getTime());
 				System.out.println("#### validDate After: "+validDate);
 				
-		    String updateSql = "UPDATE PRICELIST SET VALID_UPTO = ? WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND UNIT = ? and slab_no = ?";
+			} catch (Exception e) 
+			{
+				System.out.println("#### Exception in Calendar "+e);
+				e.printStackTrace();
+			}
+		    
+		    String updateSql = "UPDATE PRICELIST SET VALID_UPTO = ? WHERE PRICE_LIST = ? AND ITEM_CODE = ? AND LIST_TYPE = ? AND SLAB_NO = ?";
 		    PreparedStatement updatePreStmt = connection.prepareStatement(updateSql);
 		    updatePreStmt.setTimestamp(1, validDate);
 		    updatePreStmt.setString(2, priceList);
 		    updatePreStmt.setString(3, itemCode);
-		    updatePreStmt.setString(4, unit);
+		    updatePreStmt.setString(4, listType);
 		    updatePreStmt.setInt(5, slabNo);
 		    int updatedCnt = updatePreStmt.executeUpdate();