Changes made for Group scheme in Sales Order html wizard screen

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

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

@@ -27,6 +27,7 @@ import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -755,6 +756,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 							transMode = checkNullAndTrim(rs.getString("TRANS_MODE"));
 							dlvTerm = checkNullAndTrim(rs.getString("DLV_TERM"));
 							
+							Calendar cal = Calendar.getInstance();
+							Date curDateObj = cal.getTime();
+							
+							if(ordDate.before(curDateObj))
+							{
+								ordDate = new Timestamp(System.currentTimeMillis());
+							}
+							if(dueDate.before(curDateObj))
+							{
+								dueDate = new Timestamp(System.currentTimeMillis());
+							}
+							
 							sql = " SELECT CUST_CODE,CUST_NAME,CR_TERM,CURR_CODE,STAN_CODE,TRAN_CODE,TRANS_MODE,CURR_CODE__FRT,CURR_CODE__INS,TAX_CLASS,TAX_CHAP FROM CUSTOMER WHERE CUST_CODE = ? ";
 							pstmtSel = conn.prepareStatement(sql);
 							pstmtSel.setString(1, custCode);
@@ -3045,8 +3058,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				valueXmlString.append("<discount><![CDATA[").append(discount).append("]]></discount>\r\n");
 				valueXmlString.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n");
 				//Added By Kaustubh on 21 Dec 2017 start 
-				valueXmlString.append("<schemeCode><![CDATA[").append(schemeCode).append("]]></schemeCode>\r\n");
-				valueXmlString.append("<schemeDescr><![CDATA[").append(SchemeDesc).append("]]></schemeDescr>\r\n");
+				valueXmlString.append("<scheme_code><![CDATA[").append(schemeCode).append("]]></scheme_code>\r\n");
+				valueXmlString.append("<scheme_descr><![CDATA[").append(SchemeDesc).append("]]></scheme_descr>\r\n");
 				
 				//Added By Kaustubh on 5 jan 2017 start 
 				valueXmlString.append("<tax_xml>").append(taxXml).append("</tax_xml>\r\n");
@@ -3840,12 +3853,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			System.out.println("Due Date recived="+dueDate);
 			
 			//Added by Kaustubh on 21 Dec 2017 start
-			String schemeCode   = checkNullAndTrim(genericUtility.getColumnValue("schemeCode", dom1));
-			String schemeDescr   = checkNullAndTrim(genericUtility.getColumnValue("schemeDescr", dom1));
+			String schemeCode   = checkNullAndTrim(genericUtility.getColumnValue("scheme_code", dom1));
+			String schemeDescr   = checkNullAndTrim(genericUtility.getColumnValue("scheme_descr", dom1));
 			//Added by Kaustubh on 21 Dec 2017 end
 			
 			//Added by Kaustubh on 05 Jan 2017 start
-			String taxXml = checkNullAndTrim(genericUtility.getColumnValue("schemeCode", dom1));
+			String taxXml = checkNullAndTrim(genericUtility.getColumnValue("scheme_code", dom1));
 			//Added by Kaustubh on 05 Jan 2017 end
 			
 			String dueDate1 = genericUtility.getValidDateTimeString(