Skip to content

B
business-java
Commit 89fb9180 authored by cpatil's avatar cpatil
Browse files
Options

modified code for new changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@36791 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7898c928
Hide whitespace changes
Inline Side-by-side
Showing with 397 additions and 66 deletions
webitm-fin/ibase/webitm/ejb/fin/SuppInfoUpdIC.java
View file @ 89fb9180
......@@ -19,6 +19,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import javax.ejb.Stateless;
import javax.swing.text.ChangedCharSetException;
import java.sql.Timestamp;
@Stateless
......@@ -49,7 +51,7 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
{
dom2 = parseString(xmlString2);
}
errString = wfValData(dom, dom1, dom2, objContext, editFlag, xtraParams);
// errString = wfValData(dom, dom1, dom2, objContext, editFlag, xtraParams);
}
catch(Exception e)
{
......@@ -239,19 +241,19 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
String valueXmlString = "";
try
{
System.out.println("@@@@@@@@@@@@@@@ xmlString["+xmlString+"]");
if(xmlString != null && xmlString.trim().length() > 0)
{
System.out.println("@@@@@@@@@@@@@@@ xmlString["+xmlString+"]");
dom = parseString(xmlString);
}
System.out.println("@@@@@@@@@@@@@@@ xmlString1["+xmlString1+"]");
if(xmlString1 != null && xmlString1.trim().length() > 0)
{
// System.out.println("@@@@@@@@@@@@@@@ xmlString1["+xmlString1+"]");
dom1 = parseString(xmlString1);
}
System.out.println("@@@@@@@@@@@@@@@ xmlString2["+xmlString2+"]");
if(xmlString2 != null && xmlString2.trim().length() > 0)
{
// System.out.println("@@@@@@@@@@@@@@@ xmlString2["+xmlString2+"]");
dom2 = parseString(xmlString2);
}
valueXmlString = itemChanged(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
......@@ -289,16 +291,31 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
String taxReg ="",wfStatus ="",addUser = "",addTerm = "",chgUser = "",chgTerm = "";
Timestamp chgDate = null, statusDate = null, addDate = null, tranDate = null;
// added for new changes by cpatil on 27/08/2015
String contactPurcO="",contactPurc="",altAddr1O="",altAddr1="",altAddr2O="",altAddr2="",altAddr3O="",altAddr3="";
String altCityO="",altCity="",stateCodeAltO="",stateCodeAlt="",altPinO="", altPin="",altTele1O="",altTele1="";
String faxO="",fax="",emailAddrO="",emailAddr="",eccNoO="",eccNo="",cstNoO="",cstNo="",ssiO="",ssi="",tele2O="",tele2="";
String pfNoO="", pfNo="", emailPurcO="", emailPurc="", taxRegStO="", taxRegSt="";
Timestamp chgDateLast=null;
String chgUserLast="",chgTermLast="";
try
{
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDate = sdf.format(currentDate.getTime());
System.out.println("Now the date is :=> " + sysDate);
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"CHG_TERM");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"CHG_USER");
System.out.println("chgTerm["+chgTerm+"]chgUser["+chgUser+"]xtraParams["+xtraParams+"]");
// loginCode=CPATIL~~loginEmpCode=E01712 ~~loginSiteCode=TA821~~entityCode=AA0103
//~~profileId=SUN ~~userType=S~~runMode=I~~user_lang=en~~user_
//country=US~~charEnc=UTF-8~~
// timeZone=null~~termId=192.168.0.240~~chgTerm=192.168.0.240~~detCnt=1~~focusRow=1~~
// REC_CTR=-1~~saveLevel=0
//
//Calendar currentDate = Calendar.getInstance();
//java.util.Date currentDate1 = new java.util.Date();
//SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
......@@ -306,6 +323,11 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
//Timestamp newsysDate = java.sql.Timestamp.valueOf( sdf1.format(currentDate)+" 00:00:00.0");
//System.out.println("Now the date is :=> ["+newsysDate+"]");
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
Timestamp newsysDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
Date date1 = sdf1.parse(newsysDate.toString());
newsysDate = java.sql.Timestamp.valueOf(sdf1.format(date1).toString() + " 00:00:00.0");
System.out.println("newsysDate["+newsysDate+"]");
conn = connDriver.getConnectDB("DriverITM");
......@@ -330,7 +352,8 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
ctr = 0;
valueXmlString.append("<Detail1>");
int childNodeListLength = childNodeList.getLength();
do
/*
* do
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
......@@ -344,6 +367,8 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
ctr++;
}
while(ctr < childNodeListLength && !childNodeName.equals(currentColumn));
*/
System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
......@@ -376,7 +401,12 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
sql = " Select TRAN_ID, TRAN_DATE, SUPP_CODE, CHQ_NAME_O, CHQ_NAME, TELE1_O, TELE1, PAN_NO_O, PAN_NO, " +
" EXCISE_REF_O, EXCISE_REF, SER_TAX_REG_O, SER_TAX_REG, TAX_REG_O , TAX_REG, WF_STATUS, " +
" STATUS_DATE , ADD_DATE , ADD_USER , ADD_TERM , CHG_DATE , CHG_USER , CHG_TERM " +
" STATUS_DATE , ADD_DATE , ADD_USER , ADD_TERM , CHG_DATE , CHG_USER , CHG_TERM ," +
" CONTACT_PURC_O, CONTACT_PURC, ALT_ADDR1_O, ALT_ADDR1, ALT_ADDR2_O, ALT_ADDR2," + // added for new changes by cpatil on 27/08/2015
" ALT_ADDR3_O,ALT_ADDR3, ALT_CITY_O, ALT_CITY, STATE_CODE__ALT_O, STATE_CODE__ALT, " +
" ALT_PIN_O, ALT_PIN, ALT_TELE1_O, ALT_TELE1, FAX_O, FAX, EMAIL_ADDR_O, EMAIL_ADDR, " +
" ECC_NO_O, ECC_NO, CST_NO_O, CST_NO, SSI_O, SSI, TELE2_O, TELE2, PF_NO_O, PF_NO , " +
" EMAIL_PURC_O,EMAIL_PURC,TAX_REG_ST_O,TAX_REG_ST" +
" from supp_amd where supp_code = ? and wf_status = 'O' ";
}
......@@ -384,8 +414,8 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@@@@@@@@@openCnt["+cnt+"]");
if(!( cnt > 0 ))
System.out.println("@@@@@@@@@ wf_status = 'O' openCnt["+cnt+"]");
if( cnt == 0)
{
sql = "select count(1) from supp_amd where supp_code = ? and wf_status = 'S' ";
pstmt = conn.prepareStatement(sql);
......@@ -398,7 +428,12 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
sql = " Select TRAN_ID, TRAN_DATE, SUPP_CODE, CHQ_NAME_O, CHQ_NAME, TELE1_O, TELE1, PAN_NO_O, PAN_NO, " +
" EXCISE_REF_O, EXCISE_REF, SER_TAX_REG_O, SER_TAX_REG, TAX_REG_O , TAX_REG, WF_STATUS, " +
" STATUS_DATE , ADD_DATE , ADD_USER , ADD_TERM , CHG_DATE , CHG_USER , CHG_TERM " +
" STATUS_DATE , ADD_DATE , ADD_USER , ADD_TERM , CHG_DATE , CHG_USER , CHG_TERM , " +
" CONTACT_PURC_O, CONTACT_PURC, ALT_ADDR1_O, ALT_ADDR1, ALT_ADDR2_O, ALT_ADDR2," + // added for new changes by cpatil on 27/08/2015
" ALT_ADDR3_O,ALT_ADDR3, ALT_CITY_O, ALT_CITY, STATE_CODE__ALT_O, STATE_CODE__ALT, " +
" ALT_PIN_O, ALT_PIN, ALT_TELE1_O, ALT_TELE1, FAX_O, FAX, EMAIL_ADDR_O, EMAIL_ADDR, " +
" ECC_NO_O, ECC_NO, CST_NO_O, CST_NO, SSI_O, SSI, TELE2_O, TELE2, PF_NO_O, PF_NO, " +
" EMAIL_PURC_O,EMAIL_PURC,TAX_REG_ST_O,TAX_REG_ST " +
" from supp_amd where supp_code = ? and wf_status = 'S' ";
}
......@@ -406,10 +441,10 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@@@@@@@@@submitCnt["+cnt+"]");
System.out.println("@@@@@@@@@ wf_status = 'S' submitCnt["+cnt+"]");
}
if(!( cnt > 0 ))
if( cnt == 0)
{
sql = "select count(1) from supp_amd where supp_code = ? and wf_status = 'A' ";
pstmt = conn.prepareStatement(sql);
......@@ -419,7 +454,7 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
{
// wfStatus = rs.getString("wf_status");
cnt = rs.getInt(1);
System.out.println("@@@@@@@@@closeCnt["+cnt+"]");
System.out.println("@@@@@@@@@ wf_status = 'A' closeCnt["+cnt+"]");
cnt = 0 ;
/*
......@@ -435,9 +470,7 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
pstmt = null;
}
System.out.println("@@@@@@@@@@@@ sql["+sql+"]");
System.out.println("@@@@@@@@@final Cnt["+cnt+"]");
System.out.println("@@@@@@@@@final Cnt["+cnt+"]sql["+sql+"]");
if( cnt > 0 )
{
......@@ -448,28 +481,68 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
if(rs.next())
{
tranId = checkNull(rs.getString("TRAN_ID"));
suppCode = rs.getString("SUPP_CODE");
suppCode = checkNull(rs.getString("SUPP_CODE"));
tranDate = rs.getTimestamp("TRAN_DATE");
chqNameO = rs.getString("CHQ_NAME_O");
chqName = rs.getString("CHQ_NAME");
tele1O = rs.getString("TELE1_O");
tele1 = rs.getString("TELE1");
panNoO = rs.getString("PAN_NO_O");
panNo = rs.getString("PAN_NO");
exciseRefO = rs.getString("EXCISE_REF_O");
exciseRef = rs.getString("EXCISE_REF");
serTaxRegO = rs.getString("SER_TAX_REG_O");
serTaxReg = rs.getString("SER_TAX_REG");
taxRegO = rs.getString("TAX_REG_O");
taxReg = rs.getString("TAX_REG");
wfStatus = rs.getString("WF_STATUS");
chqNameO = checkNull(rs.getString("CHQ_NAME_O"));
chqName = checkNull(rs.getString("CHQ_NAME"));
tele1O = checkNull(rs.getString("TELE1_O"));
tele1 = checkNull(rs.getString("TELE1"));
panNoO = checkNull(rs.getString("PAN_NO_O"));
panNo = checkNull(rs.getString("PAN_NO"));
exciseRefO = checkNull(rs.getString("EXCISE_REF_O"));
exciseRef = checkNull(rs.getString("EXCISE_REF"));
serTaxRegO = checkNull(rs.getString("SER_TAX_REG_O"));
serTaxReg = checkNull(rs.getString("SER_TAX_REG"));
taxRegO = checkNull(rs.getString("TAX_REG_O"));
taxReg = checkNull(rs.getString("TAX_REG"));
wfStatus = checkNull(rs.getString("WF_STATUS"));
statusDate = rs.getTimestamp("STATUS_DATE");
addDate = rs.getTimestamp("ADD_DATE");
addUser = rs.getString("ADD_USER");
addTerm = rs.getString("ADD_TERM");
//chgDate = rs.getTimestamp("CHG_DATE");
//chgUser = rs.getString("CHG_USER");
//chgTerm = rs.getString("CHG_TERM");
addUser = checkNull(rs.getString("ADD_USER"));
addTerm = checkNull(rs.getString("ADD_TERM"));
chgDateLast = rs.getTimestamp("CHG_DATE");
chgUserLast = checkNull(rs.getString("CHG_USER"));
chgTermLast = checkNull(rs.getString("CHG_TERM"));
// added for new changes by cpatil on 27/08/2015
contactPurcO= checkNull(rs.getString("CONTACT_PURC_O"));
contactPurc = checkNull(rs.getString("CONTACT_PURC"));
altAddr1O = checkNull(rs.getString("ALT_ADDR1_O"));
altAddr1 = checkNull(rs.getString("ALT_ADDR1"));
altAddr2O = checkNull(rs.getString("ALT_ADDR2_O"));
altAddr2 = checkNull(rs.getString("ALT_ADDR2"));
altAddr3O= checkNull(rs.getString("ALT_ADDR3_O"));
altAddr3 = checkNull(rs.getString("ALT_ADDR3"));
altCityO = checkNull(rs.getString("ALT_CITY_O"));
altCity = checkNull(rs.getString("ALT_CITY"));
stateCodeAltO = checkNull(rs.getString("STATE_CODE__ALT_O"));
stateCodeAlt = checkNull(rs.getString("STATE_CODE__ALT"));
altPinO = checkNull(rs.getString("ALT_PIN_O"));
altPin = checkNull(rs.getString("ALT_PIN"));
altTele1O = checkNull(rs.getString("ALT_TELE1_O"));
altTele1 = checkNull(rs.getString("ALT_TELE1"));
faxO = checkNull(rs.getString("FAX_O"));
fax = checkNull(rs.getString("FAX"));
emailAddrO = checkNull(rs.getString("EMAIL_ADDR_O"));
emailAddr = checkNull(rs.getString("EMAIL_ADDR"));
eccNoO = checkNull(rs.getString("ECC_NO_O"));
eccNo = checkNull(rs.getString("ECC_NO"));
cstNoO = checkNull(rs.getString("CST_NO_O"));
cstNo = checkNull(rs.getString("CST_NO"));
ssiO = checkNull(rs.getString("SSI_O"));
ssi = checkNull(rs.getString("SSI"));
tele2O = checkNull(rs.getString("TELE2_O"));
tele2 = checkNull(rs.getString("TELE2"));
pfNoO = checkNull(rs.getString("PF_NO_O"));
pfNo = checkNull(rs.getString("PF_NO"));
emailPurcO = checkNull(rs.getString("EMAIL_PURC_O"));
emailPurc = checkNull(rs.getString("EMAIL_PURC"));
taxRegStO = checkNull(rs.getString("TAX_REG_ST_O"));
taxRegSt = checkNull(rs.getString("TAX_REG_ST"));
}
rs.close();
rs = null;
......@@ -478,16 +551,16 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
if("O".equalsIgnoreCase(wfStatus))
{
System.out.println("tranDate["+tranDate+"]statusDate["+statusDate+"]");
String tranDateStr = genericUtility.getValidDateTimeString(tranDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@tranDate["+tranDate+"]statusDateStr["+tranDateStr+"]");
System.out.println("@@@@@@@@@@@@@ statusDateStr["+tranDateStr+"]");
String statusDateStr = genericUtility.getValidDateTimeString(statusDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@statusDate["+statusDate+"]statusDateStr["+statusDateStr+"]");
System.out.println("@@@@@@@@@@@@@ statusDateStr["+statusDateStr+"]");
String addDateStr = genericUtility.getValidDateTimeString(statusDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@addDate["+addDate+"]addDateStr["+addDateStr+"]");
System.out.println("@@@@@@@@@@@@@ addDateStr["+addDateStr+"]");
valueXmlString.append("<tran_id protect = \"1\" >").append("<![CDATA["+tranId+"]]>").append("</tran_id>");
valueXmlString.append("<tran_date protect = \"1\" >").append("<![CDATA["+tranDateStr+"]]>").append("</tran_date>");
......@@ -518,24 +591,83 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
valueXmlString.append("<add_user protect = \"1\" >").append("<![CDATA["+addUser+"]]>").append("</add_user>");
valueXmlString.append("<add_term protect = \"1\" >").append("<![CDATA["+addTerm+"]]>").append("</add_term>");
valueXmlString.append("<chg_date protect = \"1\" >").append("<![CDATA["+sysDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user protect = \"1\" >").append("<![CDATA["+chgUser+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term protect = \"1\" >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
// added new requirment by cpatil
valueXmlString.append("<contact_purc protect = \"0\" >").append("<![CDATA["+contactPurc+"]]>").append("</contact_purc>");
valueXmlString.append("<contact_purc_o protect = \"1\" >").append("<![CDATA["+contactPurcO+"]]>").append("</contact_purc_o>");
valueXmlString.append("<alt_addr1 protect = \"0\" >").append("<![CDATA["+altAddr1+"]]>").append("</alt_addr1>");
valueXmlString.append("<alt_addr1_o protect = \"1\" >").append("<![CDATA["+altAddr1O+"]]>").append("</alt_addr1_o>");
valueXmlString.append("<alt_addr2 protect = \"0\" >").append("<![CDATA["+altAddr2+"]]>").append("</alt_addr2>");
valueXmlString.append("<alt_addr2_o protect = \"1\" >").append("<![CDATA["+altAddr2O+"]]>").append("</alt_addr2_o>");
valueXmlString.append("<alt_addr3 protect = \"0\" >").append("<![CDATA["+altAddr3+"]]>").append("</alt_addr3>");
valueXmlString.append("<alt_addr3_o protect = \"1\" >").append("<![CDATA["+altAddr3O+"]]>").append("</alt_addr3_o>");
valueXmlString.append("<alt_city protect = \"0\" >").append("<![CDATA["+altCity+"]]>").append("</alt_city>");
valueXmlString.append("<alt_city_o protect = \"1\" >").append("<![CDATA["+altCityO+"]]>").append("</alt_city_o>");
valueXmlString.append("<state_code__alt protect = \"0\" >").append("<![CDATA["+stateCodeAlt+"]]>").append("</state_code__alt>");
valueXmlString.append("<state_code__alt_o protect = \"1\" >").append("<![CDATA["+stateCodeAltO+"]]>").append("</state_code__alt_o>");
valueXmlString.append("<alt_pin protect = \"0\" >").append("<![CDATA["+altPin+"]]>").append("</alt_pin>");
valueXmlString.append("<alt_pin_o protect = \"1\" >").append("<![CDATA["+altPinO+"]]>").append("</alt_pin_o>");
valueXmlString.append("<alt_tele1 protect = \"0\" >").append("<![CDATA["+altTele1+"]]>").append("</alt_tele1>");
valueXmlString.append("<alt_tele1_o protect = \"1\" >").append("<![CDATA["+altTele1O+"]]>").append("</alt_tele1_o>");
valueXmlString.append("<fax protect = \"0\" >").append("<![CDATA["+fax+"]]>").append("</fax>");
valueXmlString.append("<fax_o protect = \"1\" >").append("<![CDATA["+faxO+"]]>").append("</fax_o>");
valueXmlString.append("<email_addr protect = \"0\" >").append("<![CDATA["+emailAddr+"]]>").append("</email_addr>");
valueXmlString.append("<email_addr_o protect = \"1\" >").append("<![CDATA["+emailAddrO+"]]>").append("</email_addr_o>");
valueXmlString.append("<ecc_no protect = \"0\" >").append("<![CDATA["+eccNo+"]]>").append("</ecc_no>");
valueXmlString.append("<ecc_no_o protect = \"1\" >").append("<![CDATA["+eccNoO+"]]>").append("</ecc_no_o>");
valueXmlString.append("<cst_no protect = \"0\" >").append("<![CDATA["+cstNo+"]]>").append("</cst_no>");
valueXmlString.append("<cst_no_o protect = \"1\" >").append("<![CDATA["+cstNoO+"]]>").append("</cst_no_o>");
valueXmlString.append("<ssi protect = \"0\" >").append("<![CDATA["+ssi+"]]>").append("</ssi>");
valueXmlString.append("<ssi_o protect = \"1\" >").append("<![CDATA["+ssiO+"]]>").append("</ssi_o>");
valueXmlString.append("<tele2 protect = \"0\" >").append("<![CDATA["+tele2+"]]>").append("</tele2>");
valueXmlString.append("<tele2_o protect = \"1\" >").append("<![CDATA["+tele2O+"]]>").append("</tele2_o>");
valueXmlString.append("<pf_no protect = \"0\" >").append("<![CDATA["+pfNo+"]]>").append("</pf_no>");
valueXmlString.append("<pf_no_o protect = \"1\" >").append("<![CDATA["+pfNoO+"]]>").append("</pf_no_o>");
valueXmlString.append("<email_purc protect = \"0\" >").append("<![CDATA["+emailPurc+"]]>").append("</email_purc>");
valueXmlString.append("<email_purc_o protect = \"1\" >").append("<![CDATA["+emailPurcO+"]]>").append("</email_purc_o>");
valueXmlString.append("<tax_reg_st protect = \"0\" >").append("<![CDATA["+taxRegSt+"]]>").append("</tax_reg_st>");
valueXmlString.append("<tax_reg_st_o protect = \"1\" >").append("<![CDATA["+taxRegStO+"]]>").append("</tax_reg_st_o>");
}
else if("S".equalsIgnoreCase(wfStatus))
{
System.out.println("tranDate["+tranDate+"]statusDate["+statusDate+"]addDate["+addDate+"]chgDateLast["+chgDateLast+"]");
String tranDateStr = genericUtility.getValidDateTimeString(tranDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@tranDate["+tranDate+"]statusDateStr["+tranDateStr+"]");
System.out.println("@@@@@@@@@@@@@ statusDateStr["+tranDateStr+"]");
String statusDateStr = genericUtility.getValidDateTimeString(statusDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@statusDate["+statusDate+"]statusDateStr["+statusDateStr+"]");
System.out.println("@@@@@@@@@@@@@ statusDateStr["+statusDateStr+"]");
String addDateStr = genericUtility.getValidDateTimeString(statusDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@addDate["+addDate+"]addDateStr["+addDateStr+"]");
String addDateStr = genericUtility.getValidDateTimeString(addDate,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@ addDateStr["+addDateStr+"]");
String chgDateLastStr = genericUtility.getValidDateTimeString( chgDateLast ,genericUtility.getApplDateFormat());
System.out.println("@@@@@@@@@@@@@ chgDateLastStr["+chgDateLastStr+"]");
valueXmlString.append("<tran_id protect = \"1\" >").append("<![CDATA["+tranId+"]]>").append("</tran_id>");
valueXmlString.append("<tran_date protect = \"1\" >").append("<![CDATA["+tranDateStr+"]]>").append("</tran_date>");
valueXmlString.append("<supp_code protect = \"1\" >").append("<![CDATA["+suppCode+"]]>").append("</supp_code>");
......@@ -566,9 +698,64 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
valueXmlString.append("<add_term protect = \"1\" >").append("<![CDATA["+addTerm+"]]>").append("</add_term>");
valueXmlString.append("<chg_date protect = \"1\" >").append("<![CDATA["+sysDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user protect = \"1\" >").append("<![CDATA["+chgUser+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term protect = \"1\" >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<chg_date protect = \"1\" >").append("<![CDATA["+chgDateLastStr+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user protect = \"1\" >").append("<![CDATA["+chgUserLast+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term protect = \"1\" >").append("<![CDATA["+chgTermLast+"]]>").append("</chg_term>");
// added new requirment by cpatil
valueXmlString.append("<contact_purc protect = \"1\" >").append("<![CDATA["+contactPurc+"]]>").append("</contact_purc>");
valueXmlString.append("<contact_purc_o protect = \"1\" >").append("<![CDATA["+contactPurcO+"]]>").append("</contact_purc_o>");
valueXmlString.append("<alt_addr1 protect = \"1\" >").append("<![CDATA["+altAddr1+"]]>").append("</alt_addr1>");
valueXmlString.append("<alt_addr1_o protect = \"1\" >").append("<![CDATA["+altAddr1O+"]]>").append("</alt_addr1_o>");
valueXmlString.append("<alt_addr2 protect = \"1\" >").append("<![CDATA["+altAddr2+"]]>").append("</alt_addr2>");
valueXmlString.append("<alt_addr2_o protect = \"1\" >").append("<![CDATA["+altAddr2O+"]]>").append("</alt_addr2_o>");
valueXmlString.append("<alt_addr3 protect = \"1\" >").append("<![CDATA["+altAddr3+"]]>").append("</alt_addr3>");
valueXmlString.append("<alt_addr3_o protect = \"1\" >").append("<![CDATA["+altAddr3O+"]]>").append("</alt_addr3_o>");
valueXmlString.append("<alt_city protect = \"1\" >").append("<![CDATA["+altCity+"]]>").append("</alt_city>");
valueXmlString.append("<alt_city_o protect = \"1\" >").append("<![CDATA["+altCityO+"]]>").append("</alt_city_o>");
valueXmlString.append("<state_code__alt protect = \"1\" >").append("<![CDATA["+stateCodeAlt+"]]>").append("</state_code__alt>");
valueXmlString.append("<state_code__alt_o protect = \"1\" >").append("<![CDATA["+stateCodeAltO+"]]>").append("</state_code__alt_o>");
valueXmlString.append("<alt_pin protect = \"1\" >").append("<![CDATA["+altPin+"]]>").append("</alt_pin>");
valueXmlString.append("<alt_pin_o protect = \"1\" >").append("<![CDATA["+altPinO+"]]>").append("</alt_pin_o>");
valueXmlString.append("<alt_tele1 protect = \"1\" >").append("<![CDATA["+altTele1+"]]>").append("</alt_tele1>");
valueXmlString.append("<alt_tele1_o protect = \"1\" >").append("<![CDATA["+altTele1O+"]]>").append("</alt_tele1_o>");
valueXmlString.append("<fax protect = \"1\" >").append("<![CDATA["+fax+"]]>").append("</fax>");
valueXmlString.append("<fax_o protect = \"1\" >").append("<![CDATA["+faxO+"]]>").append("</fax_o>");
valueXmlString.append("<email_addr protect = \"1\" >").append("<![CDATA["+emailAddr+"]]>").append("</email_addr>");
valueXmlString.append("<email_addr_o protect = \"1\" >").append("<![CDATA["+emailAddrO+"]]>").append("</email_addr_o>");
valueXmlString.append("<ecc_no protect = \"1\" >").append("<![CDATA["+eccNo+"]]>").append("</ecc_no>");
valueXmlString.append("<ecc_no_o protect = \"1\" >").append("<![CDATA["+eccNoO+"]]>").append("</ecc_no_o>");
valueXmlString.append("<cst_no protect = \"1\" >").append("<![CDATA["+cstNo+"]]>").append("</cst_no>");
valueXmlString.append("<cst_no_o protect = \"1\" >").append("<![CDATA["+cstNoO+"]]>").append("</cst_no_o>");
valueXmlString.append("<ssi protect = \"1\" >").append("<![CDATA["+ssi+"]]>").append("</ssi>");
valueXmlString.append("<ssi_o protect = \"1\" >").append("<![CDATA["+ssiO+"]]>").append("</ssi_o>");
valueXmlString.append("<tele2 protect = \"1\" >").append("<![CDATA["+tele2+"]]>").append("</tele2>");
valueXmlString.append("<tele2_o protect = \"1\" >").append("<![CDATA["+tele2O+"]]>").append("</tele2_o>");
valueXmlString.append("<pf_no protect = \"1\" >").append("<![CDATA["+pfNo+"]]>").append("</pf_no>");
valueXmlString.append("<pf_no_o protect = \"1\" >").append("<![CDATA["+pfNoO+"]]>").append("</pf_no_o>");
valueXmlString.append("<email_purc protect = \"1\" >").append("<![CDATA["+emailPurc+"]]>").append("</email_purc>");
valueXmlString.append("<email_purc_o protect = \"1\" >").append("<![CDATA["+emailPurcO+"]]>").append("</email_purc_o>");
valueXmlString.append("<tax_reg_st protect = \"1\" >").append("<![CDATA["+taxRegSt+"]]>").append("</tax_reg_st>");
valueXmlString.append("<tax_reg_st_o protect = \"1\" >").append("<![CDATA["+taxRegStO+"]]>").append("</tax_reg_st_o>");
}
}
else
......@@ -597,7 +784,6 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
System.out.println("keyString :"+ keyString);
System.out.println("keyCol :"+ keyCol);
System.out.println("tranSer1 :"+ tranSer1);
// System.out.println("woirType :"+ woirType);
String xmlValues = "";
String tranDateStr = getCurrdateAppFormat();
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
......@@ -605,7 +791,6 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
// xmlValues = xmlValues + "<woir_type>" + woirType + "</woir_type>";
xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>";
xmlValues = xmlValues +"</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
......@@ -613,7 +798,11 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
tranId = tg.generateTranSeqID(tranSer1, keyCol, keyString, conn);
System.out.println("@@@@ generated tranId :["+tranId+"]");
sql = " select supp_code, chq_name, tele1,pan_no,excise_ref,ser_tax_reg,tax_reg " +
sql = " select supp_code, chq_name, tele1,pan_no,excise_ref,ser_tax_reg,tax_reg ," +
" CONTACT_PURC, ALT_ADDR1, ALT_ADDR2," + // added for new changes by cpatil on 27/08/2015
" ALT_ADDR3, ALT_CITY, STATE_CODE__ALT, " +
" ALT_PIN, ALT_TELE1, FAX, EMAIL_ADDR, " +
" ECC_NO, CST_NO, SSI, TELE2, PF_NO, EMAIL_PURC, TAX_REG_ST " +
" from supplier where supp_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,suppCode);
......@@ -627,6 +816,25 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
exciseRef = checkNull(rs.getString("excise_ref"));
serTaxReg = checkNull(rs.getString("ser_tax_reg"));
taxReg = checkNull(rs.getString("tax_reg"));
contactPurc = checkNull(rs.getString("CONTACT_PURC")); // added for new changes by cpatil on 27/08/2015
altAddr1 = checkNull(rs.getString("ALT_ADDR1"));
altAddr2 = checkNull(rs.getString("ALT_ADDR2"));
altAddr3 = checkNull(rs.getString("ALT_ADDR3"));
altCity = checkNull(rs.getString("ALT_CITY"));
stateCodeAlt = checkNull(rs.getString("STATE_CODE__ALT"));
altPin = checkNull(rs.getString("ALT_PIN"));
altTele1 = checkNull(rs.getString("ALT_TELE1"));
fax = checkNull(rs.getString("FAX"));
emailAddr = checkNull(rs.getString("EMAIL_ADDR"));
eccNo = checkNull(rs.getString("ECC_NO"));
cstNo = checkNull(rs.getString("CST_NO"));
ssi = checkNull(rs.getString("SSI"));
tele2 = checkNull(rs.getString("TELE2"));
pfNo = checkNull(rs.getString("PF_NO"));
emailPurc = checkNull(rs.getString("EMAIL_PURC"));
taxRegSt = checkNull(rs.getString("TAX_REG_ST"));
}
rs.close();
rs = null;
......@@ -634,23 +842,94 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
pstmt = null;
sql = " insert into supp_amd ( tran_id, supp_code , chq_name_o, tele1_o,pan_no_o,excise_ref_o,ser_tax_reg_o," +
"tax_reg_o, wf_status " +
" ) values (?,?,?,?,?,?,?,?,? ) ";
sql = " insert into supp_amd ( tran_id, supp_code , chq_name_o,chq_name, tele1_o," +
" tele1, pan_no_o, pan_no, excise_ref_o, excise_ref, " +
" ser_tax_reg_o, ser_tax_reg, tax_reg_o, tax_reg, wf_status, " +
" CONTACT_PURC_O, CONTACT_PURC, ALT_ADDR1_O, ALT_ADDR1, ALT_ADDR2_O," + // added for new changes by cpatil on 27/08/2015
" ALT_ADDR2, ALT_ADDR3_O,ALT_ADDR3, ALT_CITY_O, ALT_CITY, " +
" STATE_CODE__ALT_O, STATE_CODE__ALT, ALT_PIN_O, ALT_PIN, ALT_TELE1_O, " +
" ALT_TELE1, FAX_O, FAX, EMAIL_ADDR_O, EMAIL_ADDR, " +
" ECC_NO_O, ECC_NO, CST_NO_O, CST_NO, SSI_O, " +
" SSI, TELE2_O, TELE2, PF_NO_O, PF_NO," +
" EMAIL_PURC_O,EMAIL_PURC, TAX_REG_ST_O,TAX_REG_ST, status_date, " +
" add_date,add_user,add_term,chg_date,chg_user," +
" chg_term, tran_date" +
" ) values ( " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,?,?,?,?, " +
" ?,? " +
" ) ";
System.out.println("sql :"+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setString(2,suppCode);
pstmt.setString(3,chqName);
pstmt.setString(4,tele1);
pstmt.setString(5,panNo);
pstmt.setString(6,exciseRef);
pstmt.setString(7,serTaxReg);
pstmt.setString(8,taxReg);
pstmt.setString(9,"O");
pstmt.setString(4,chqName);
pstmt.setString(5,tele1);
pstmt.setString(6,tele1);
pstmt.setString(7,panNo);
pstmt.setString(8,panNo);
pstmt.setString(9,exciseRef);
pstmt.setString(10,exciseRef);
pstmt.setString(11,serTaxReg);
pstmt.setString(12,serTaxReg);
pstmt.setString(13,taxReg);
pstmt.setString(14,taxReg);
pstmt.setString(15,"O");
pstmt.setString(16,contactPurc ); // added for new changes by cpatil on 27/08/2015
pstmt.setString(17,contactPurc );
pstmt.setString(18,altAddr1 );
pstmt.setString(19,altAddr1 );
pstmt.setString(20,altAddr2 );
pstmt.setString(21,altAddr2 );
pstmt.setString(22,altAddr3 );
pstmt.setString(23,altAddr3 );
pstmt.setString(24,altCity );
pstmt.setString(25,altCity );
pstmt.setString(26,stateCodeAlt );
pstmt.setString(27,stateCodeAlt );
pstmt.setString(28,altPin );
pstmt.setString(29,altPin );
pstmt.setString(30,altTele1 );
pstmt.setString(31,altTele1 );
pstmt.setString(32,fax );
pstmt.setString(33,fax );
pstmt.setString(34,emailAddr );
pstmt.setString(35,emailAddr );
pstmt.setString(36,eccNo );
pstmt.setString(37,eccNo );
pstmt.setString(38,cstNo );
pstmt.setString(39,cstNo );
pstmt.setString(40,ssi );
pstmt.setString(41,ssi );
pstmt.setString(42,tele2 );
pstmt.setString(43,tele2 );
pstmt.setString(44,pfNo );
pstmt.setString(45,pfNo );
pstmt.setString(46,emailPurc );
pstmt.setString(47,emailPurc );
pstmt.setString(48,taxRegSt );
pstmt.setString(49,taxRegSt );
pstmt.setTimestamp(50,newsysDate );
pstmt.setTimestamp(51,newsysDate );
pstmt.setString(52,chgUser );
pstmt.setString(53,chgTerm );
pstmt.setTimestamp(54,newsysDate );
pstmt.setString(55,chgUser );
pstmt.setString(56,chgTerm );
pstmt.setTimestamp(57,newsysDate );
cnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
......@@ -661,8 +940,6 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
conn.commit();
}
valueXmlString.append("<tran_id protect = \"1\" >").append("<![CDATA["+tranId+"]]>").append("</tran_id>");
......@@ -698,6 +975,60 @@ public class SuppInfoUpdIC extends ValidatorEJB implements SuppInfoUpdICLocal, S
valueXmlString.append("<chg_user protect = \"1\" >").append("<![CDATA["+chgUser+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term protect = \"1\" >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
// added new requirment by cpatil
valueXmlString.append("<contact_purc protect = \"0\" >").append("<![CDATA["+contactPurc+"]]>").append("</contact_purc>");
valueXmlString.append("<contact_purc_o protect = \"1\" >").append("<![CDATA["+contactPurc+"]]>").append("</contact_purc_o>");
valueXmlString.append("<alt_addr1 protect = \"0\" >").append("<![CDATA["+altAddr1+"]]>").append("</alt_addr1>");
valueXmlString.append("<alt_addr1_o protect = \"1\" >").append("<![CDATA["+altAddr1+"]]>").append("</alt_addr1_o>");
valueXmlString.append("<alt_addr2 protect = \"0\" >").append("<![CDATA["+altAddr2+"]]>").append("</alt_addr2>");
valueXmlString.append("<alt_addr2_o protect = \"1\" >").append("<![CDATA["+altAddr2+"]]>").append("</alt_addr2_o>");
valueXmlString.append("<alt_addr3 protect = \"0\" >").append("<![CDATA["+altAddr3+"]]>").append("</alt_addr3>");
valueXmlString.append("<alt_addr3_o protect = \"1\" >").append("<![CDATA["+altAddr3+"]]>").append("</alt_addr3_o>");
valueXmlString.append("<alt_city protect = \"0\" >").append("<![CDATA["+altCity+"]]>").append("</alt_city>");
valueXmlString.append("<alt_city_o protect = \"1\" >").append("<![CDATA["+altCity+"]]>").append("</alt_city_o>");
valueXmlString.append("<state_code__alt protect = \"0\" >").append("<![CDATA["+stateCodeAlt+"]]>").append("</state_code__alt>");
valueXmlString.append("<state_code__alt_o protect = \"1\" >").append("<![CDATA["+stateCodeAlt+"]]>").append("</state_code__alt_o>");
valueXmlString.append("<alt_pin protect = \"0\" >").append("<![CDATA["+altPin+"]]>").append("</alt_pin>");
valueXmlString.append("<alt_pin_o protect = \"1\" >").append("<![CDATA["+altPin+"]]>").append("</alt_pin_o>");
valueXmlString.append("<alt_tele1 protect = \"0\" >").append("<![CDATA["+altTele1+"]]>").append("</alt_tele1>");
valueXmlString.append("<alt_tele1_o protect = \"1\" >").append("<![CDATA["+altTele1+"]]>").append("</alt_tele1_o>");
valueXmlString.append("<fax protect = \"0\" >").append("<![CDATA["+fax+"]]>").append("</fax>");
valueXmlString.append("<fax_o protect = \"1\" >").append("<![CDATA["+fax+"]]>").append("</fax_o>");
valueXmlString.append("<email_addr protect = \"0\" >").append("<![CDATA["+emailAddr+"]]>").append("</email_addr>");
valueXmlString.append("<email_addr_o protect = \"1\" >").append("<![CDATA["+emailAddr+"]]>").append("</email_addr_o>");
valueXmlString.append("<ecc_no protect = \"0\" >").append("<![CDATA["+eccNo+"]]>").append("</ecc_no>");
valueXmlString.append("<ecc_no_o protect = \"1\" >").append("<![CDATA["+eccNo+"]]>").append("</ecc_no_o>");
valueXmlString.append("<cst_no protect = \"0\" >").append("<![CDATA["+cstNo+"]]>").append("</cst_no>");
valueXmlString.append("<cst_no_o protect = \"1\" >").append("<![CDATA["+cstNo+"]]>").append("</cst_no_o>");
valueXmlString.append("<ssi protect = \"0\" >").append("<![CDATA["+ssi+"]]>").append("</ssi>");
valueXmlString.append("<ssi_o protect = \"1\" >").append("<![CDATA["+ssi+"]]>").append("</ssi_o>");
valueXmlString.append("<tele2 protect = \"0\" >").append("<![CDATA["+tele2+"]]>").append("</tele2>");
valueXmlString.append("<tele2_o protect = \"1\" >").append("<![CDATA["+tele2+"]]>").append("</tele2_o>");
valueXmlString.append("<pf_no protect = \"0\" >").append("<![CDATA["+pfNo+"]]>").append("</pf_no>");
valueXmlString.append("<pf_no_o protect = \"1\" >").append("<![CDATA["+pfNo+"]]>").append("</pf_no_o>");
valueXmlString.append("<email_purc protect = \"0\" >").append("<![CDATA["+emailPurc+"]]>").append("</email_purc>");
valueXmlString.append("<email_purc_o protect = \"1\" >").append("<![CDATA["+emailPurc+"]]>").append("</email_purc_o>");
valueXmlString.append("<tax_reg_st protect = \"0\" >").append("<![CDATA["+taxRegSt+"]]>").append("</tax_reg_st>");
valueXmlString.append("<tax_reg_st_o protect = \"1\" >").append("<![CDATA["+taxRegSt+"]]>").append("</tax_reg_st_o>");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment