Updated the class file for PO Autosave, for updating the validupto date in pricelist

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

webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJB.java

@@ -1611,8 +1611,10 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 				 	// Changed by Sneha on 24-08-2016, for pricelist [Start]
 				 	/*sql = " select rate from pricelist where item_code = ? "
 							+"and price_list in (select price_list from supplier where supp_dcode = ? ) ";*/
-				 	sql = "select rate from pricelist where item_code = ? and sysdate between eff_from and valid_upto and " 
-				 		+ " price_list in (select price_list from supplier where supp_code = ? ) order by pricelist.eff_from desc ";
+				 	sql = "SELECT * FROM ( " 
+				 		+ "SELECT * FROM PRICELIST WHERE ITEM_CODE = ? AND (SYSDATE BETWEEN EFF_FROM AND VALID_UPTO) AND " 
+				 		+ "PRICE_LIST IN (SELECT PRICE_LIST FROM SUPPLIER WHERE SUPP_CODE = ? ) ORDER BY PRICELIST.SLAB_NO DESC ) " 
+				 		+ "WHERE ROWNUM = 1 ";
 				 	// Changed by Sneha on 24-08-2016, for pricelist [End]
 				 
 				 	pstmt = conn.prepareStatement(sql);

webitm-wms/ibase/webitm/ejb/wms/DDProductWizEditPosEJB.java

@@ -8,6 +8,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -1034,7 +1035,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
 									pstmtIns.executeUpdate();
 									pstmtIns.close(); pstmtIns = null;
 								}
-	
+
 								int slabNo = 1; 
 								double rates = 0;
 								String effFrDt = "" , validUpDt = "" ;
@@ -1056,7 +1057,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
 								pstmtIns.close();
 								pstmtIns = null;
 								rs1.close();rs1 = null;
-	
+
 								String fromDate = "", toDate = "";
 								if(!effFrDt.equals("") && !validUpDt.equals("") )
 								{
@@ -1066,13 +1067,29 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
 											checkNullAndTrim(validUpDt), genericUtility.getDBDateFormat(), genericUtility.getDispDateFormat());
 								}
 	
+								
 								if( !supp_item[0].equals("0") && (rates != Double.parseDouble(suppRate) || ! fromDate.equals(suppFrDt) || ! toDate.equals(suppToDt)) )
 								{
+									// Changed by Sneha on 29-08-2016, for VALID_UPTO date [Start]
+									String effFromAppl = genericUtility.getValidDateString(checkNullAndTrim(validUpDt), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());									
+									Calendar calender = Calendar.getInstance();
+									java.text.SimpleDateFormat sdtf = new java.text.SimpleDateFormat( genericUtility.getApplDateFormat() );
+									java.util.Date effFromCal = sdtf.parse( effFromAppl );
+									
+									calender.setTime( effFromCal );
+									calender.add( calender.DATE, -1 );
+									java.text.SimpleDateFormat  sdf =  new java.text.SimpleDateFormat( genericUtility.getDBDateFormat() );
+									java.sql.Date effectFrom = java.sql.Date.valueOf( sdf.format( calender.getTime() ) );
+									Timestamp effectFromTS = Timestamp.valueOf(genericUtility.getValidDateString(effectFrom.toString(), genericUtility.getDBDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");					
+									System.out.println("effectFromTS ---------->>"+effectFromTS);
+									// Changed by Sneha on 29-08-2016, for VALID_UPTO date [End]
+									
 									String sqlPricesIns1 = "UPDATE PRICELIST SET VALID_UPTO = ?, CHG_DATE = SYSDATE, CHG_USER = ?, CHG_TERM = ? " +
 									" WHERE ITEM_CODE = ? AND PRICE_LIST = ?";
 	
 									pstmtIns = conn.prepareStatement(sqlPricesIns1);
-									pstmtIns.setTimestamp(1, currDate);
+									//pstmtIns.setTimestamp(1, currDate);
+									pstmtIns.setTimestamp(1, effectFromTS);	// Changed by Sneha on 29-08-2016 for validupto date 
 									pstmtIns.setString(2, userId); 
 									pstmtIns.setString(3, chgTerm); 
 									pstmtIns.setString(4, item_code);