Commit 36a4195b authored by pbhosale's avatar pbhosale

updated on [30-12-2019]

finent_acctprd11.xml
finent_acctprd21.xml
w_finent_acctprd.sql
d_finent_acctprd11.srd
d_finent_acctprd21.srd
FinEntAcctPrd.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214287 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0e75fe9f
...@@ -69,27 +69,27 @@ update ITM2MENU set ICON_PATH = 'FinancialEntitywiseAccountingPeriod.png', CLOSE ...@@ -69,27 +69,27 @@ update ITM2MENU set ICON_PATH = 'FinancialEntitywiseAccountingPeriod.png', CLOSE
----------------------------------------------------[21/10/19][START] ----------------------------------------------------[21/10/19][START]
update TRANSETUP set REF_SER = 'F-ACPR' where TRAN_WINDOW = 'w_finent_acctprd';
update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_FINENT_ACCTPRD'; update POPHELP set AUTO_FILL_LEN = '3', AUTO_MIN_LENGTH = 2 , HELP_OPTION = 2 where MOD_NAME = 'W_FINENT_ACCTPRD';
update POPHELP set THUMB_ALT_COL = 'descr',THUMB_IMAGE_COL= 'fin_entity',THUMB_OBJ = 'FinImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'FIN_ENTITY'; update POPHELP set THUMB_ALT_COL = 'descr',THUMB_IMAGE_COL= 'fin_entity',THUMB_OBJ = 'FinentImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'FIN_ENTITY';
update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'code',THUMB_OBJ = 'AcctPrdImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'ACCT_PRD'; update POPHELP set THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'code',THUMB_OBJ = 'AcctPrdImages' where MOD_NAME = 'W_FINENT_ACCTPRD' and FIELD_NAME= 'ACCT_PRD';
----------------------------------------------------[21/10/19][END] ----------------------------------------------------[21/10/19][END]
----------------------------------------------------[23/10/19][START]
update TRANSETUP set PERIOD_OPTION = 'M',THUMB_ALT_COL = 'descr', THUMB_IMAGE_COL= 'fin_entity', THUMB_OBJ = 'FinImages' where TRAN_WINDOW = 'w_finent_acctprd'; ----------------------------------------------------[16/12/2019][START]
update TRANSETUP set TRAN_ID_COL = 'fin_entity,acct_prd' where TRAN_WINDOW = 'w_finent_acctprd';
update OBJ_ACTIONS set TITLE = 'Audit Trail' where OBJ_NAME = 'finent_acctprd' and LINE_NO = '21';
----------------------------------------------------[16/12/2019][END]
----------------------------------------------------[30/12/2019][START]
update TRANSETUP set EDI_OPTION = 0 , OBJ_TYPE = 'C', ENABLE_EDITOR = 'C' where TRAN_WINDOW = 'w_finent_acctprd';
----------------------------------------------------[30/12/2019][END]
update OBJ_FORMS set THUMB_ALT_COL = 'fin_entity', THUMB_IMAGE_COL= 'fin_entity', THUMB_OBJ = 'FinImages' where WIN_NAME = 'w_finent_acctprd';
UPDATE obj_forms
SET disp_metadata = '<html>
<span style="white-space: normal !important; word-break: break-word; "> <b>{finent_descr} </b> (<b>{fin_entity}</b>) <br/>
Accounting Period : <b>{descr}</b> Effective From : <b>{fr_date}</b> To : <b>{to_date}</b>
</span>
</html>' WHERE win_name ='w_finent_acctprd';
----------------------------------------------------[23/10/19][END]
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<dbname>finent_acctprd.chg_term</dbname> <dbname>finent_acctprd.chg_term</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;finent_acctprd&quot; ) TABLE(NAME=&quot;finent&quot; ) COLUMN(NAME=&quot;finent_acctprd.fin_entity&quot;) COLUMN(NAME=&quot;finent.descr&quot;) COLUMN(NAME=&quot;finent_acctprd.acct_prd&quot;) COLUMN(NAME=&quot;finent_acctprd.descr&quot;) COLUMN(NAME=&quot;finent_acctprd.fr_date&quot;) COLUMN(NAME=&quot;finent_acctprd.to_date&quot;) COLUMN(NAME=&quot;finent_acctprd.it_fr_date&quot;) COLUMN(NAME=&quot;finent_acctprd.it_to_date&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_date&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_user&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_term&quot;) JOIN (LEFT=&quot;finent.fin_entity&quot; OP =&quot;=&quot;RIGHT=&quot;finent_acctprd.fin_entity&quot; )WHERE( EXP1 =&quot;~&quot;FINENT_ACCTPRD~&quot;.~&quot;FIN_ENTITY~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:fin_entity&quot; ) ) ARG(NAME = &quot;fin_entity&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;finent_acctprd&quot; ) TABLE(NAME=&quot;finent&quot; ) COLUMN(NAME=&quot;finent_acctprd.fin_entity&quot;) COLUMN(NAME=&quot;finent.descr&quot;) COLUMN(NAME=&quot;finent_acctprd.acct_prd&quot;) COLUMN(NAME=&quot;finent_acctprd.descr&quot;) COLUMN(NAME=&quot;finent_acctprd.fr_date&quot;) COLUMN(NAME=&quot;finent_acctprd.to_date&quot;) COLUMN(NAME=&quot;finent_acctprd.it_fr_date&quot;) COLUMN(NAME=&quot;finent_acctprd.it_to_date&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_date&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_user&quot;) COLUMN(NAME=&quot;finent_acctprd.chg_term&quot;) JOIN (LEFT=&quot;finent.fin_entity&quot; OP =&quot;=&quot;RIGHT=&quot;finent_acctprd.fin_entity&quot; )WHERE( EXP1 =&quot;~&quot;FINENT_ACCTPRD~&quot;.~&quot;FIN_ENTITY~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:fin_entity&quot; ) ) ARG(NAME = &quot;fin_entity&quot; TYPE = string) </retrieve>
<update>finent_acctprd</update> <update>FINENT_ACCTPRD</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
<band>Detail</band> <band>Detail</band>
<id>1</id> <id>1</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>10</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>2</x> <x>2</x>
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
<band>Detail</band> <band>Detail</band>
<id>3</id> <id>3</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>20</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>337</x> <x>337</x>
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
<band>Detail</band> <band>Detail</band>
<id>5</id> <id>5</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>30</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>641</x> <x>641</x>
...@@ -637,7 +637,7 @@ ...@@ -637,7 +637,7 @@
<band>Detail</band> <band>Detail</band>
<id>6</id> <id>6</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>40</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>738</x> <x>738</x>
...@@ -675,7 +675,7 @@ ...@@ -675,7 +675,7 @@
<band>Detail</band> <band>Detail</band>
<id>7</id> <id>7</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>50</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>834</x> <x>834</x>
...@@ -713,7 +713,7 @@ ...@@ -713,7 +713,7 @@
<band>Detail</band> <band>Detail</band>
<id>8</id> <id>8</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>60</tabsequence>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>928</x> <x>928</x>
...@@ -841,7 +841,7 @@ ...@@ -841,7 +841,7 @@
<name>chg_term</name> <name>chg_term</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="edit">
<limit>15</limit> <limit>300</limit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle> <focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect> <autoselect>yes</autoselect>
......
...@@ -25,6 +25,10 @@ import ibase.webitm.utility.ITMException; ...@@ -25,6 +25,10 @@ import ibase.webitm.utility.ITMException;
//@Stateless //@Stateless
public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, FinEntAcctPrdLocal public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, FinEntAcctPrdLocal
{ {
//Modified by POONAM on 24/06/2019.start
E12GenericUtility genericUtility = new E12GenericUtility();
ITMDBAccessEJB itmdbAccessEJB =new ITMDBAccessEJB();
//Modified by POONAM on 24/06/2019.End
// VALIDATION START // VALIDATION START
public String wfValData() throws RemoteException, ITMException public String wfValData() throws RemoteException, ITMException
{ {
...@@ -37,22 +41,29 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -37,22 +41,29 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
Document dom1 = null; Document dom1 = null;
Document dom2 = null; Document dom2 = null;
String errString = ""; String errString = "";
//Modified by POONAM on 24/06/2019.start
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by POONAM on 24/06/2019.End
try try
{ {
if (xmlString != null && xmlString.trim().length() != 0) if (xmlString != null && xmlString.trim().length() != 0)
{ {
dom = parseString(xmlString); //Modified by POONAM on 24/06/2019.start
//dom = parseString(xmlString);
dom = genericUtility.parseString(xmlString);
//Modified by POONAM on 24/06/2019.end
} }
if (xmlString1 != null && xmlString1.trim().length() != 0) if (xmlString1 != null && xmlString1.trim().length() != 0)
{ {
dom1 = parseString(xmlString1); //Modified by POONAM on 24/06/2019.start
//dom1 = parseString(xmlString1);
dom1 = genericUtility.parseString(xmlString1);
//Modified by POONAM on 24/06/2019.end
} }
if (xmlString2 != null && xmlString2.trim().length() > 0) if (xmlString2 != null && xmlString2.trim().length() > 0)
{ {
dom2 = parseString(xmlString2); //Modified by POONAM on 24/06/2019.start
//dom2 = parseString(xmlString2);
dom2 = genericUtility.parseString(xmlString2);
//Modified by POONAM on 24/06/2019.end
} }
errString = wfValData(dom, dom1, dom2, objContext, editFlag, xtraParams); errString = wfValData(dom, dom1, dom2, objContext, editFlag, xtraParams);
} }
...@@ -85,9 +96,9 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -85,9 +96,9 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
SimpleDateFormat simpleDateFormat = null; SimpleDateFormat simpleDateFormat = null;
//Modified by POONAM on 24/06/2019.Start /*//Modified by POONAM on 24/06/2019.Start
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by POONAM on 24/06/2019.End //Modified by POONAM on 24/06/2019.End*/
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
...@@ -673,9 +684,7 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -673,9 +684,7 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
int errListSize = errList.size(); int errListSize = errList.size();
StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
// Modified BY POONAM on 24/06/2019.Start
ITMDBAccessEJB itmdbAccessEJB =new ITMDBAccessEJB();
//Modified BY POONAM on 24/06/2019.END
//ERRORLIST //ERRORLIST
if (errList != null && errListSize > 0) if (errList != null && errListSize > 0)
{ {
...@@ -769,15 +778,23 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -769,15 +778,23 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
{ {
if (xmlString != null && xmlString.trim().length() != 0) if (xmlString != null && xmlString.trim().length() != 0)
{ {
dom = parseString(xmlString); // Modified BY POONAM on 24/06/2019.Start
//dom = parseString(xmlString);
dom = genericUtility.parseString(xmlString);
// Modified BY POONAM on 24/06/2019.end
} }
if (xmlString1 != null && xmlString1.trim().length() != 0) if (xmlString1 != null && xmlString1.trim().length() != 0)
{ {
dom1 = parseString(xmlString1); // Modified BY POONAM on 24/06/2019.Start
//dom1 = parseString(xmlString1);
dom1 = genericUtility.parseString(xmlString1);
// Modified BY POONAM on 24/06/2019.end
} }
if (xmlString2 != null && xmlString2.trim().length() > 0) if (xmlString2 != null && xmlString2.trim().length() > 0)
{ {
dom2 = parseString(xmlString2); // Modified BY POONAM on 24/06/2019.Start
dom2 = genericUtility.parseString(xmlString2);
// Modified BY POONAM on 24/06/2019.End
} }
valueXmlString = itemChanged(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams); valueXmlString = itemChanged(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
} }
...@@ -791,7 +808,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -791,7 +808,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
{ {
E12GenericUtility genericUtility = null;
//Modified by Poonam on 26/06/2019.start
//E12GenericUtility genericUtility = null;
//Modified by Poonam on 26/06/2019.end
Connection conn = null; Connection conn = null;
int currentFormNo = 0; int currentFormNo = 0;
...@@ -812,8 +832,8 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -812,8 +832,8 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
try try
{ {
valueXmlString = new StringBuffer(); valueXmlString = new StringBuffer();
genericUtility = new E12GenericUtility();
//Modified by Poonam on 26/06/2019.start //Modified by Poonam on 26/06/2019.start
//genericUtility = new E12GenericUtility();
//ConnDriver connDriver = new ConnDriver(); //ConnDriver connDriver = new ConnDriver();
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn.setAutoCommit(false); //conn.setAutoCommit(false);
...@@ -837,7 +857,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -837,7 +857,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
valueXmlString.append("<Detail1>"); valueXmlString.append("<Detail1>");
if (currentColumn.trim().equalsIgnoreCase("itm_default")) if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
loginSiteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); //Modified by Poonam on 26/06/2019.start
//loginSiteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//Modified by Poonam on 26/06/2019.end
if (loginSiteCode != null && loginSiteCode.trim().length() > 0) if (loginSiteCode != null && loginSiteCode.trim().length() > 0)
{ {
sql = " select a.fin_entity as fin_entity, b.descr as descr from site a , finent b where a.site_code = ? and b.fin_entity = a.fin_entity "; sql = " select a.fin_entity as fin_entity, b.descr as descr from site a , finent b where a.site_code = ? and b.fin_entity = a.fin_entity ";
...@@ -865,7 +888,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -865,7 +888,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
} }
else if (currentColumn.trim().equalsIgnoreCase("fin_entity")) else if (currentColumn.trim().equalsIgnoreCase("fin_entity"))
{ {
finEnt = genericUtility.getColumnValue("fin_entity", dom); //Modified by Poonam on 26/06/2019.start
//finEnt = genericUtility.getColumnValue("fin_entity", dom);
finEnt = checkNull(genericUtility.getColumnValue("fin_entity", dom));
//Modified by Poonam on 26/06/2019.end
query = " select descr from finent where fin_entity = ? "; query = " select descr from finent where fin_entity = ? ";
pstmt = conn.prepareStatement(query); pstmt = conn.prepareStatement(query);
pstmt.setString(1, finEnt); pstmt.setString(1, finEnt);
...@@ -889,7 +915,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -889,7 +915,10 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
else if (currentColumn.trim().equalsIgnoreCase("acct_prd")) else if (currentColumn.trim().equalsIgnoreCase("acct_prd"))
{ {
int itDateCnt = 0; int itDateCnt = 0;
acctPrd = genericUtility.getColumnValue("acct_prd", dom); //Modified by Poonam on 26/06/2019.start
//acctPrd = genericUtility.getColumnValue("acct_prd", dom);
acctPrd = checkNull(genericUtility.getColumnValue("acct_prd", dom));
//Modified by Poonam on 26/06/2019.end
query = " select descr, fr_date, to_date, it_fr_date, it_to_date, case when it_fr_date is not null and it_to_date is not null then 1 else 0 end as itDateCnt from acctprd where code = ? "; query = " select descr, fr_date, to_date, it_fr_date, it_to_date, case when it_fr_date is not null and it_to_date is not null then 1 else 0 end as itDateCnt from acctprd where code = ? ";
pstmt = conn.prepareStatement(query); pstmt = conn.prepareStatement(query);
pstmt.setString(1, acctPrd); pstmt.setString(1, acctPrd);
...@@ -934,20 +963,32 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote, ...@@ -934,20 +963,32 @@ public class FinEntAcctPrd extends ValidatorEJB implements FinEntAcctPrdRemote,
else else
{ {
valueXmlString.append("<it_fr_date>").append("<![CDATA[" + itFrDate + "]]>").append("</it_fr_date>"); valueXmlString.append("<it_fr_date>").append("<![CDATA[" + itFrDate + "]]>").append("</it_fr_date>");
valueXmlString.append("<it_to_date protect=\"1\">").append("<![CDATA[" + itToDate + "]]>").append("</it_to_date>"); //Modified by Poonam on 30/12/2019.start
//valueXmlString.append("<it_to_date protect=\"1\">").append("<![CDATA[" + itToDate + "]]>").append("</it_to_date>");
valueXmlString.append("<it_to_date protect=\"1\">").append("<![CDATA[]]>").append("</it_to_date>");
//Modified by Poonam on 30/12/2019.end
} }
} }
else if (currentColumn.trim().equalsIgnoreCase("it_fr_date")) else if (currentColumn.trim().equalsIgnoreCase("it_fr_date"))
{ {
itFrDate = genericUtility.getColumnValue("it_fr_date", dom); //Modified by Poonam on 26/06/2019.start
if (itFrDate != null) //itFrDate = genericUtility.getColumnValue("it_fr_date", dom);
{ itFrDate = checkNull(genericUtility.getColumnValue("it_fr_date", dom));
//Modified by Poonam on 26/06/2019.end
//Modified by Poonam on 24/12/2019.start
//if (itFrDate != null)
itToDate = checkNull(genericUtility.getColumnValue("it_to_date", dom)); itToDate = checkNull(genericUtility.getColumnValue("it_to_date", dom));
if (itFrDate != null && itFrDate.length() != 0)
//Modified by Poonam on 24/12/2019.end
{
valueXmlString.append("<it_to_date protect=\"0\">").append("<![CDATA[" + itToDate + "]]>").append("</it_to_date>"); valueXmlString.append("<it_to_date protect=\"0\">").append("<![CDATA[" + itToDate + "]]>").append("</it_to_date>");
} }
else else
{ {
valueXmlString.append("<it_to_date protect=\"1\">").append("").append("</it_to_date>"); //Modified by Poonam on 30/12/2019.start
//valueXmlString.append("<it_to_date protect=\"1\">").append("<![CDATA[" + itToDate + "]]>").append("</it_to_date>");
valueXmlString.append("<it_to_date protect=\"1\">").append("<![CDATA[]]>").append("</it_to_date>");
//Modified by Poonam on 30/12/2019.end
} }
} }
......
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