Skip to content

B
business-java
Commit 04445302 authored by arane's avatar arane
Browse files
Options

Issue regarding Receipt Dishonour 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215567 ce508802-f39f-4f6c-b175-0d175dae99d5
parent aacc2917
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 10 deletions
webitm-fin/src/ibase/webitm/ejb/fin/ReceiptDishonourIC.java
View file @ 04445302
...@@ -756,7 +756,7 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -756,7 +756,7 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
ArrayList errList = new ArrayList(); ArrayList errList = new ArrayList();
ArrayList errFields = new ArrayList(); ArrayList errFields = new ArrayList();
SimpleDateFormat dateFormat1 = null; SimpleDateFormat dateFormat1 = null;
String reStr = " ", userId, receiptCustCode; String reStr = " ", userId, receiptCustCode, ls_cr_limit="";
int childNodeLength = 0; int childNodeLength = 0;
String rcpSundryType, sundryCode, sitecode, custName = null, bankCode = null, bankBName = null, siteCode = null; String rcpSundryType, sundryCode, sitecode, custName = null, bankCode = null, bankBName = null, siteCode = null;
String descr = " "; String descr = " ";
...@@ -775,7 +775,7 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -775,7 +775,7 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
double intPerc, chqamt, billamt = 0; double intPerc, chqamt, billamt = 0;
String loginSiteDescr, reasCode = "", crTermOld = "", siteCodeFor = ""; String loginSiteDescr, reasCode = "", crTermOld = "", siteCodeFor = "";
String crTerm = "", finparmCrTerm = "", siteDesr = "", crTermDesr = ""; String crTerm = "", finparmCrTerm = "", siteDesr = "", crTermDesr = "";
double noOfDays, exchRate = 0, billAmt; double noOfDays, exchRate = 0, billAmt, creditLimit=0;
int pos = 0; int pos = 0;
String rcpSundryCode=" ", fnSundryName = ""; String rcpSundryCode=" ", fnSundryName = "";
String bankAccCodeBc="", bankcctrCodebc=" "; String bankAccCodeBc="", bankcctrCodebc=" ";
...@@ -796,6 +796,8 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -796,6 +796,8 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
date = (sdf.format(timestamp).toString()).trim(); date = (sdf.format(timestamp).toString()).trim();
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>"); valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
valueXmlString.append(editFlag).append("</editFlag> </header>"); valueXmlString.append(editFlag).append("</editFlag> </header>");
FinCommon Fcommon=new FinCommon();//added by Anagha Rane 20-01-2020
if ((objContext != null) && (objContext.trim().length() > 0)) if ((objContext != null) && (objContext.trim().length() > 0))
{ {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
...@@ -870,6 +872,8 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -870,6 +872,8 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
{ {
//System.out.println("inside the Receipt number and tran series itmchange"); //System.out.println("inside the Receipt number and tran series itmchange");
finparamcrterm = finCommon.getFinparams("999999", "DISHONOUR_CR_TERM", conn); finparamcrterm = finCommon.getFinparams("999999", "DISHONOUR_CR_TERM", conn);
System.out.println("finparmcrterm>>>>"+finparamcrterm);//Added by Anagha Rane 17-01-2020
tranSer = checkNull(genericUtility.getColumnValue("tran_ser", dom)); tranSer = checkNull(genericUtility.getColumnValue("tran_ser", dom));
if ("R".equalsIgnoreCase(tranSer)) if ("R".equalsIgnoreCase(tranSer))
{ {
...@@ -926,19 +930,27 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -926,19 +930,27 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
String remarkTakenFrom="";//Added by Anagha Rane 20-01-2020
if ("NULLFOUND".equalsIgnoreCase(finparamcrterm) || finparamcrterm == null) if ("NULLFOUND".equalsIgnoreCase(finparamcrterm) || finparamcrterm == null)
{ {
finparmCrTerm = crTerm; //finparmCrTerm = crTerm;
valueXmlString.append("<cr_term>").append("<![CDATA[" + finparmCrTerm + "]]>").append("</cr_term>"); finparamcrterm= crTerm;//Changed by Anagha Rane 20-01-2020 defining correct variable
System.out.println("finparamcrterm>>"+finparamcrterm);
//valueXmlString.append("<cr_term>").append("<![CDATA[" + finparmCrTerm + "]]>").append("</cr_term>");
valueXmlString.append("<cr_term>").append("<![CDATA[" + finparamcrterm + "]]>").append("</cr_term>");//Changed by Anagha Rane 20-01-2020 defining correct variable
remarkTakenFrom="customer";//Changed by Anagha Rane 20-01-2020
}else{
remarkTakenFrom="finparm";//Changed by Anagha Rane 20-01-2020
} }
System.out.println("inside the if finparamcrterm"+crTerm); //System.out.println("inside the if finparamcrterm"+crTerm);
System.out.println("inside the if finparamcrterm"+finparamcrterm);
//System.out.println("custCode----------->>>>>>>>>>>>>"+custCode); //System.out.println("custCode----------->>>>>>>>>>>>>"+custCode);
sql = "select descr from crterm where cr_term = ?"; sql = "select descr from crterm where cr_term = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, crTerm); //pstmt.setString(1, crTerm);
pstmt.setString(1, finparamcrterm);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -948,6 +960,67 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -948,6 +960,67 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//Added by Anagha Rane 17-01-2020 Start
String crLimitTakenFrom="";
ls_cr_limit = Fcommon.getFinparams("999999","CR_LIMIT_ON_DISHNR",conn);
System.out.println("ls_cr_limit>>>>"+ls_cr_limit);
if(!"NULLFOUND".equalsIgnoreCase(ls_cr_limit.trim()))
{
creditLimit = Double.parseDouble(ls_cr_limit);
crLimitTakenFrom="Finparm";//Changed by Anagha Rane 20-01-2020
}
System.out.println("creditlimit>>>>"+creditLimit);
String tname="",colName="",sundryType="C";
boolean setCrLimit=false;
if("C".equalsIgnoreCase(sundryType.trim()))
{
tname="customer";
colName="cust_code";
if(creditLimit>0)
{
setCrLimit=true;
crLimitTakenFrom="customer";//Changed by Anagha Rane 20-01-2020
}
}
else if("S".equalsIgnoreCase(sundryType.trim()))
{
tname="supplier";
colName="supp_code";
if(creditLimit>0)
{
setCrLimit=true;
crLimitTakenFrom="supplier";//Changed by Anagha Rane 20-01-2020
}
}
else if("T".equalsIgnoreCase(sundryType.trim()))
{
tname="transporter";
colName="tran_code";
if(creditLimit>0)
{
setCrLimit=true;
crLimitTakenFrom="transporter";//Changed by Anagha Rane 20-01-2020
}
}
else if("X".equalsIgnoreCase(sundryType.trim()))
{
tname="tax_authority";
colName="tauth_code";
if(creditLimit>0)
{
setCrLimit=true;
crLimitTakenFrom="tax_authority";//Changed by Anagha Rane 20-01-2020
}
}
//end of the code added by ajit on date 22-may-2017
String remarks1 = "Credit term (" + finparamcrterm + " ) is taken from "+remarkTakenFrom+" and Credit limit (" + ls_cr_limit + ") is taken from " + tname;//Changed by Anagha Rane 17-01-2020
System.out.println("remarks: "+remarks1);//Changed by Anagha Rane 17-01-2020
//Added by Anagha Rane 17-01-2020 End
if (finEntity != null && finEntity.trim().length() > 0) if (finEntity != null && finEntity.trim().length() > 0)
{ {
// System.out.println("inside the if FinEntity"+finEntity); // System.out.println("inside the if FinEntity"+finEntity);
...@@ -979,10 +1052,14 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour ...@@ -979,10 +1052,14 @@ public class ReceiptDishonourIC extends ValidatorEJB implements ReceiptDishonour
valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>");
valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>"); valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
// valueXmlString.append("<cr_term>").append("<![CDATA[" + finparmCrTerm + "]]>").append("</cr_term>"); // valueXmlString.append("<cr_term>").append("<![CDATA[" + finparmCrTerm + "]]>").append("</cr_term>");
valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>"); //valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
valueXmlString.append("<cr_term>").append("<![CDATA[" + finparamcrterm + "]]>").append("</cr_term>");
valueXmlString.append("<cr_term__remark>").append("<![CDATA[" + remarks1 + "]]>").append("</cr_term__remark>");//Added by Anagha Rane 17-01-2020
System.out.println("crterm in xml"+crTerm); System.out.println("crterm in xml"+finparamcrterm);
valueXmlString.append("<cr_term__old>").append("<![CDATA[" + crTermOld + "]]>").append("</cr_term__old>"); //valueXmlString.append("<cr_term__old>").append("<![CDATA[" + crTermOld + "]]>").append("</cr_term__old>");
valueXmlString.append("<cr_term__old>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term__old>");
System.out.println("crterm in old xml"+crTerm);
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>"); valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankBName + "]]>").append("</bank_bank_name>"); valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankBName + "]]>").append("</bank_bank_name>");
valueXmlString.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
......
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