Skip to content

B
business-java
Commit b9e770f4 authored by asant's avatar asant
Browse files
Options

Made Supplier bank work flow related changes. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205194 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 96e21582
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6053 additions and 17 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/SupplierBankSaveWf.java
View file @ b9e770f4
...@@ -29,7 +29,7 @@ public class SupplierBankSaveWf ...@@ -29,7 +29,7 @@ public class SupplierBankSaveWf
return "#### Exception "+e; return "#### Exception "+e;
} }
} }
String sqlQuery = "UPDATE SUPPLIER_BANK SET ACTIVE_YN = ? WHERE SUPP_CODE = ? AND BANK_CODE__BEN = ?"; String sqlQuery = "UPDATE SUPPLIER_BANK SET ACTIVE_YN = ?, CONFIRMED = ?, WF_STATUS = ? WHERE SUPP_CODE = ? AND BANK_CODE__BEN = ?";
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
Connection connection = null; Connection connection = null;
PreparedStatement preparedStatement = null; PreparedStatement preparedStatement = null;
...@@ -45,8 +45,10 @@ public class SupplierBankSaveWf ...@@ -45,8 +45,10 @@ public class SupplierBankSaveWf
preparedStatement = connection.prepareStatement(sqlQuery); preparedStatement = connection.prepareStatement(sqlQuery);
preparedStatement.setString(1,"Y"); preparedStatement.setString(1,"Y");
preparedStatement.setString(2,suppCode); preparedStatement.setString(2,"Y");
preparedStatement.setString(3,bankCodeBen); preparedStatement.setString(3,"S");
preparedStatement.setString(4,suppCode);
preparedStatement.setString(5,bankCodeBen);
count = preparedStatement.executeUpdate(); count = preparedStatement.executeUpdate();
if (count == 1) if (count == 1)
...@@ -113,4 +115,67 @@ public class SupplierBankSaveWf ...@@ -113,4 +115,67 @@ public class SupplierBankSaveWf
} }
} }
public String updateOnReject(String userInfo, String suppCode, String bankCodeBen)
{
System.out.println("#### updateOnReject....");
suppCode = E12GenericUtility.checkNull(suppCode);
bankCodeBen = E12GenericUtility.checkNull(bankCodeBen);
System.out.println("#### suppCode "+suppCode +" #### bankCodeBen "+bankCodeBen);
if(suppCode.length() == 0 || bankCodeBen.length() == 0)
{
try
{
throw new Exception("#### Exception :: updateOnReject : empty argument");
}
catch (Exception e)
{
e.printStackTrace();
return "#### Exception "+e;
}
}
String sqlQuery = "UPDATE SUPPLIER_BANK SET WF_STATUS = ? WHERE SUPP_CODE = ? AND BANK_CODE__BEN = ?";
ConnDriver connDriver = new ConnDriver();
Connection connection = null;
PreparedStatement preparedStatement = null;
int count = 0;
try
{
UserInfoBean userInfoBean = new UserInfoBean(userInfo);
String transDB = userInfoBean.getTransDB();
connection = connDriver.getConnectDB(transDB);
connection.setAutoCommit(false);
preparedStatement = connection.prepareStatement(sqlQuery);
preparedStatement.setString(1,"R");
preparedStatement.setString(2,suppCode);
preparedStatement.setString(3,bankCodeBen);
count = preparedStatement.executeUpdate();
if (count == 1)
{
connection.commit();
}
} catch (Exception e)
{
e.printStackTrace();
return "#### Exception updateOnReject "+e;
} finally
{
try
{
if (preparedStatement != null) { preparedStatement.close(); preparedStatement = null;}
if (connection != null) { connection.close(); connection = null;}
} catch (SQLException e)
{
e.printStackTrace();
}
}
System.out.println ("#### updated record "+count);
return ""+count;
}
} }
webitm-fin/module-resource/SRD/d_supplier_bank11.srd 0 → 100644
View file @ b9e770f4
This diff is collapsed.
webitm-fin/module-resource/SRD/d_supplier_bank21.srd 0 → 100644
View file @ b9e770f4
This diff is collapsed.
webitm-fin/module-resource/sql/F18LBAS001.sql
View file @ b9e770f4
...@@ -16,3 +16,10 @@ INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJ ...@@ -16,3 +16,10 @@ INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJ
INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJECT,BODY_TEXT,BODY_COMP,PRIORITY,DELIVERY_REPORT,RETURN_RECEIPT,MAIL_APPLICATION,MAIL_SERVER,MAIL_BOX,MAIL_ID,ATTACH_TYPE,ATTACH_TEXT,WINNAME,WIN_NAME,MAIL_GENERATION,MAIL_DESCR,FN_NAME,COND_METHOD,EMAIL_EXPR,TEMPLATE_PURPOSE,STATUS,USER_ID__OWN,ATTACH_OBJECT) VALUES ('SPBNK_APPRVD','T','[(E)ROLE_CODE]',NULL,NULL,'Supplier bank for <Detail1.supp_code> is approved.','Dear Sir/Madam,Supplier for, Supp code :<Detail1.supp_code> Bank Code :<Detail1.bank_code__ben> is Approved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJECT,BODY_TEXT,BODY_COMP,PRIORITY,DELIVERY_REPORT,RETURN_RECEIPT,MAIL_APPLICATION,MAIL_SERVER,MAIL_BOX,MAIL_ID,ATTACH_TYPE,ATTACH_TEXT,WINNAME,WIN_NAME,MAIL_GENERATION,MAIL_DESCR,FN_NAME,COND_METHOD,EMAIL_EXPR,TEMPLATE_PURPOSE,STATUS,USER_ID__OWN,ATTACH_OBJECT) VALUES ('SPBNK_APPRVD','T','[(E)ROLE_CODE]',NULL,NULL,'Supplier bank for <Detail1.supp_code> is approved.','Dear Sir/Madam,Supplier for, Supp code :<Detail1.supp_code> Bank Code :<Detail1.bank_code__ben> is Approved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
--Level 2 Sign_trans --Level 2 Sign_trans
INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJECT,BODY_TEXT,BODY_COMP,PRIORITY,DELIVERY_REPORT,RETURN_RECEIPT,MAIL_APPLICATION,MAIL_SERVER,MAIL_BOX,MAIL_ID,ATTACH_TYPE,ATTACH_TEXT,WINNAME,WIN_NAME,MAIL_GENERATION,MAIL_DESCR,FN_NAME,COND_METHOD,EMAIL_EXPR,TEMPLATE_PURPOSE,STATUS,USER_ID__OWN,ATTACH_OBJECT) VALUES ('SPBNK_SIGN','T','[(E)ROLE_CODE]',NULL,NULL,'Please approve the proposed Supplier bank','Dear Sir/Madam,Please approve the Supplier bank for Supp code :<Detail1.supp_code> Bank Code :<Detail1.bank_code__ben>.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO MAIL_FORMAT (FORMAT_CODE,FORMAT_TYPE,SEND_TO,COPY_TO,BLIND_COPY,SUBJECT,BODY_TEXT,BODY_COMP,PRIORITY,DELIVERY_REPORT,RETURN_RECEIPT,MAIL_APPLICATION,MAIL_SERVER,MAIL_BOX,MAIL_ID,ATTACH_TYPE,ATTACH_TEXT,WINNAME,WIN_NAME,MAIL_GENERATION,MAIL_DESCR,FN_NAME,COND_METHOD,EMAIL_EXPR,TEMPLATE_PURPOSE,STATUS,USER_ID__OWN,ATTACH_OBJECT) VALUES ('SPBNK_SIGN','T','[(E)ROLE_CODE]',NULL,NULL,'Please approve the proposed Supplier bank','Dear Sir/Madam,Please approve the Supplier bank for Supp code :<Detail1.supp_code> Bank Code :<Detail1.bank_code__ben>.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-- Added on 14-AUG-2019 [START]
update transetup set CONFIRM_COL = 'confirmed' where TRAN_WINDOW = 'w_supplier_bank';
update obj_actions set SHOW_CONFIRM ='000' where OBJ_NAME ='supplier_bank' and title in ('Edit','Confirm');
update transetup set CANCEL_COL = 'wf_status' ,CANCEL_VAL ='R' where TRAN_WINDOW = 'w_supplier_bank';
update obj_forms set TITLE = 'Supplier Bank' where WIN_NAME ='w_supplier_bank';
-- Added on 14-AUG-2019 [END]
\ No newline at end of file
webitm-fin/module-resource/xml-workflow/SUPBNK_WRKFLW.xml
View file @ b9e770f4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<RedefinableHeader PublicationStatus="UNDER_TEST"/> <RedefinableHeader PublicationStatus="UNDER_TEST"/>
<Participants> <Participants>
<Participant Id="SPBNK_INIT" Name="SPBNK_INIT"> <Participant Id="SPBNK_INIT" Name="SPBNK_INIT">
<ParticipantType Type="ROLE"/> <ParticipantType1 Type="ROLE"/>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="PRFMR_ROLE_CODE" Value="SPBNK_INIT"/> <ExtendedAttribute Name="PRFMR_ROLE_CODE" Value="SPBNK_INIT"/>
<ExtendedAttribute Name="SIGN_FOR" Value="Initiator"/> <ExtendedAttribute Name="SIGN_FOR" Value="Initiator"/>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</ExtendedAttributes> </ExtendedAttributes>
</Participant> </Participant>
<Participant Id="SPBNK_APR1" Name="SPBNK_APR1"> <Participant Id="SPBNK_APR1" Name="SPBNK_APR1">
<ParticipantType Type="ROLE"/> <ParticipantType1 Type="ROLE"/>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="PRFMR_ROLE_CODE" Value="SPBNK_APR1"/> <ExtendedAttribute Name="PRFMR_ROLE_CODE" Value="SPBNK_APR1"/>
<ExtendedAttribute Name="SIGN_FOR" Value="Approver"/> <ExtendedAttribute Name="SIGN_FOR" Value="Approver"/>
...@@ -160,6 +160,31 @@ ...@@ -160,6 +160,31 @@
<ExtendedAttribute Name="METHOD_NAME" Value="sendMail"/> <ExtendedAttribute Name="METHOD_NAME" Value="sendMail"/>
</ExtendedAttributes> </ExtendedAttributes>
</Application> </Application>
<Application Id="ON_REJCT" Name="ON_REJCT">
<FormalParameters>
<FormalParameter Id="USER_INFO" Index="1" Mode="IN">
<DataType>
<BasicType Type="STRING"/>
</DataType>
</FormalParameter>
<FormalParameter Id="SUPP_CODE" Index="2" Mode="IN">
<DataType>
<BasicType Type="STRING"/>
</DataType>
</FormalParameter>
<FormalParameter Id="BANK_CODE_BEN" Index="3" Mode="IN">
<DataType>
<BasicType Type="STRING"/>
</DataType>
</FormalParameter>
</FormalParameters>
<ExtendedAttributes>
<ExtendedAttribute Name="APPLN_TYPE" Value="JB"/>
<ExtendedAttribute Name="COMP_NAME" Value="ibase.webitm.ejb.fin.adv.SupplierBankSaveWf"/>
<ExtendedAttribute Name="METHOD_NAME" Value="updateOnReject"/>
<ExtendedAttribute Name="EXEC_MODE" Value="SYNC"/>
</ExtendedAttributes>
</Application>
</Applications> </Applications>
<Activities> <Activities>
<Activity Id="SUPBNK_WRKFLW" Name="SUPBNK_WRKFLW"> <Activity Id="SUPBNK_WRKFLW" Name="SUPBNK_WRKFLW">
...@@ -228,7 +253,7 @@ ...@@ -228,7 +253,7 @@
</ActualParameters> </ActualParameters>
</Tool> </Tool>
</Implementation> </Implementation>
<Performer>SPBNK_INIT</Performer> <Performer>SPBNK_APR1</Performer>
<StartMode> <StartMode>
<Automatic/> <Automatic/>
</StartMode> </StartMode>
...@@ -236,9 +261,9 @@ ...@@ -236,9 +261,9 @@
<Automatic/> <Automatic/>
</FinishMode> </FinishMode>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="ParticipantID" Value="SPBNK_INIT"/> <ExtendedAttribute Name="ParticipantID" Value="SPBNK_APR1"/>
<ExtendedAttribute Name="XOffset" Value="490"/> <ExtendedAttribute Name="XOffset" Value="500"/>
<ExtendedAttribute Name="YOffset" Value="80"/> <ExtendedAttribute Name="YOffset" Value="20"/>
</ExtendedAttributes> </ExtendedAttributes>
</Activity> </Activity>
<Activity Id="SUPBNK_ARVMAIL" Name="SUPBNK_ARVMAIL"> <Activity Id="SUPBNK_ARVMAIL" Name="SUPBNK_ARVMAIL">
...@@ -260,7 +285,7 @@ ...@@ -260,7 +285,7 @@
</FinishMode> </FinishMode>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="ParticipantID" Value="SPBNK_INIT"/> <ExtendedAttribute Name="ParticipantID" Value="SPBNK_INIT"/>
<ExtendedAttribute Name="XOffset" Value="610"/> <ExtendedAttribute Name="XOffset" Value="500"/>
<ExtendedAttribute Name="YOffset" Value="80"/> <ExtendedAttribute Name="YOffset" Value="80"/>
</ExtendedAttributes> </ExtendedAttributes>
</Activity> </Activity>
...@@ -287,6 +312,29 @@ ...@@ -287,6 +312,29 @@
<ExtendedAttribute Name="YOffset" Value="80"/> <ExtendedAttribute Name="YOffset" Value="80"/>
</ExtendedAttributes> </ExtendedAttributes>
</Activity> </Activity>
<Activity Id="On_rejct_spbnk" Name="On_rejct_spbnk">
<Implementation>
<Tool Id="ON_REJCT" Type="APPLICATION">
<ActualParameters>
<ActualParameter>$USER_INFO</ActualParameter>
<ActualParameter>&lt;Detail1.supp_code&gt;</ActualParameter>
<ActualParameter>&lt;Detail1.bank_code__ben&gt;</ActualParameter>
</ActualParameters>
</Tool>
</Implementation>
<Performer>SPBNK_APR1</Performer>
<StartMode>
<Automatic/>
</StartMode>
<FinishMode>
<Automatic/>
</FinishMode>
<ExtendedAttributes>
<ExtendedAttribute Name="ParticipantID" Value="SPBNK_APR1"/>
<ExtendedAttribute Name="XOffset" Value="230"/>
<ExtendedAttribute Name="YOffset" Value="20"/>
</ExtendedAttributes>
</Activity>
</Activities> </Activities>
<Transitions> <Transitions>
<Transition From="SUPBNK_WRKFLW" Id="SUPBNK_WRKFLW_Tra2" To="SPBNK_APPR_SIGN1"> <Transition From="SUPBNK_WRKFLW" Id="SUPBNK_WRKFLW_Tra2" To="SPBNK_APPR_SIGN1">
...@@ -308,18 +356,25 @@ ...@@ -308,18 +356,25 @@
<ExtendedAttribute Name="VAR_NAMES" Value="$APP_RESULT"/> <ExtendedAttribute Name="VAR_NAMES" Value="$APP_RESULT"/>
</ExtendedAttributes> </ExtendedAttributes>
</Transition> </Transition>
<Transition From="SPBNK_APPR_SIGN1" Id="SUPBNK_WRKFLW_Tra5" To="SUPBNK_RJTMAIL"> <Transition From="SPBNK_APPR_SIGN1" Id="SUPBNK_WRKFLW_Tra5" To="On_rejct_spbnk">
<Condition Type="CONDITION">$APP_RESULT == "R"</Condition> <Condition Type="CONDITION">$APP_RESULT == "R"</Condition>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="RoutingType" Value="NOROUTING"/> <ExtendedAttribute Name="RoutingType" Value="NOROUTING"/>
<ExtendedAttribute Name="VAR_NAMES" Value="$APP_RESULT"/> <ExtendedAttribute Name="VAR_NAMES" Value="$APP_RESULT"/>
</ExtendedAttributes> </ExtendedAttributes>
</Transition> </Transition>
<Transition From="On_rejct_spbnk" Id="SUPBNK_WRKFLW_Tra13" To="SUPBNK_RJTMAIL">
<Condition Type="CONDITION">$APP_RESULT=="1"</Condition>
<ExtendedAttributes>
<ExtendedAttribute Name="RoutingType" Value="NOROUTING"/>
<ExtendedAttribute Name="VAR_NAMES" Value="$APP_RESULT"/>
</ExtendedAttributes>
</Transition>
</Transitions> </Transitions>
<ExtendedAttributes> <ExtendedAttributes>
<ExtendedAttribute Name="StartOfWorkflow" Value="SPBNK_INIT;SUPBNK_WRKFLW;390;10;NOROUTING"/> <ExtendedAttribute Name="StartOfWorkflow" Value="SPBNK_INIT;SUPBNK_WRKFLW;390;10;NOROUTING"/>
<ExtendedAttribute Name="EndOfWorkflow" Value="SPBNK_INIT;SUPBNK_RJTMAIL;150;80;NOROUTING"/> <ExtendedAttribute Name="EndOfWorkflow" Value="SPBNK_INIT;SUPBNK_ARVMAIL;650;80;NOROUTING"/>
<ExtendedAttribute Name="EndOfWorkflow" Value="SPBNK_INIT;SUPBNK_ARVMAIL;710;80;NOROUTING"/> <ExtendedAttribute Name="EndOfWorkflow" Value="SPBNK_INIT;SUPBNK_RJTMAIL;110;80;NOROUTING"/>
<ExtendedAttribute Name="ParticipantVisualOrder" Value="SPBNK_INIT;SPBNK_APR1;"/> <ExtendedAttribute Name="ParticipantVisualOrder" Value="SPBNK_INIT;SPBNK_APR1;"/>
</ExtendedAttributes> </ExtendedAttributes>
</WorkflowProcess> </WorkflowProcess>
......
webitm-fin/module-resource/xml/supplier_bank11.xml 0 → 100644
View file @ b9e770f4
This diff is collapsed.
webitm-fin/module-resource/xml/supplier_bank21.xml 0 → 100644
View file @ b9e770f4
This diff is collapsed.
webitm-fin/module-resource/xsl-workflow/SUPBNK_WRKFLW.xsl
View file @ b9e770f4
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<xsl:variable name="bank_name__ben"> <xsl:variable name="bank_name__ben">
<xsl:value-of select="bank_name__ben" /> <xsl:value-of select="bank_name__ben" />
</xsl:variable> </xsl:variable>
<xsl:variable name="eff_from"> <!-- <xsl:variable name="eff_from">
<xsl:value-of select="eff_from" /> <xsl:value-of select="eff_from" />
</xsl:variable> </xsl:variable>
<xsl:variable name="valid_upto"> <xsl:variable name="valid_upto">
<xsl:value-of select="valid_upto" /> <xsl:value-of select="valid_upto" />
</xsl:variable> </xsl:variable> -->
<xsl:variable name="bank_acct_no__ben"> <xsl:variable name="bank_acct_no__ben">
<xsl:value-of select="bank_acct_no__ben" /> <xsl:value-of select="bank_acct_no__ben" />
</xsl:variable> </xsl:variable>
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<tr> <tr>
<td class="tLabelDataD3" width="50%" style="text-align:left;">Bank : <xsl:value-of select="bank_name__ben"/> (<xsl:value-of select="bank_code__ben"/>)</td> <td class="tLabelDataD3" width="50%" style="text-align:left;">Bank : <xsl:value-of select="bank_name__ben"/> (<xsl:value-of select="bank_code__ben"/>)</td>
</tr> </tr>
<tr> <!-- <tr>
<td class="tLabelDataD3" width="50%" style="text-align:left;" >Effective From : <xsl:value-of select="eff_from" /></td> <td class="tLabelDataD3" width="50%" style="text-align:left;" >Effective From : <xsl:value-of select="eff_from" /></td>
</tr> </tr>
<tr> <tr>
<td class="tLabelDataD3" width="50%" style="text-align:left;">Valid Upto: <xsl:value-of select="valid_upto" /></td> <td class="tLabelDataD3" width="50%" style="text-align:left;">Valid Upto: <xsl:value-of select="valid_upto" /></td>
</tr> </tr> -->
</TABLE> </TABLE>
</td></tr></TABLE> </td></tr></TABLE>
......
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