Skip to content

B
business-java
Commit af8d824a authored by prane's avatar prane
Browse files
Options

chnages done for GTPL No.325,326,328 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@184713 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b01fc0ea
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 11 deletions
webitm-fin/ibase/webitm/ejb/fin/GenerateReceiptPrc.java
View file @ af8d824a
......@@ -16,6 +16,7 @@ import javax.naming.InitialContext;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.fin.*;
import ibase.webitm.ejb.fin.adv.*;
import ibase.webitm.utility.*;
import ibase.system.config.*;
import ibase.utility.CommonConstants;
......@@ -803,6 +804,7 @@ conn = getConnection();
String acctCodeAdv = "",cctrCodeAdv = "",finEntity = "",acctPrd = "",bankName = "",acctCodeBal = "";
String cctrCodeBal = "",acctCodeCf = "",cctrCodeCf = "",chgUser = "",chgTerm = "",custBankRef = "",acctCodeCfAr = "";
String invoiceId = "",lineNo = "",chequeNo = "",schequeDate = "",schqAmount = "",refNo = "",cctrCodeCfAr = "";
String jvAutoConf = "";
NodeList parentNodeList = null,parentNodeList2 = null;
NodeList childNodeList = null,childNodeList2 = null;
Node parentNode = null,parentNode2 = null;
......@@ -826,10 +828,13 @@ conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
conn.setAutoCommit(false);
}
ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf();
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); //changes by Nandkumar gadkari on 29/03/18
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
//Added by Pavan R 10-may-18 to flag in filter on receivable JV creation, to create a confirmed or unconfirmed JV.
jvAutoConf = genericUtility.getColumnValue("jv_auto_conf",headerDom);
System.out.println("Pavan----jvAutoConf ["+jvAutoConf+"]");
//Added by Pavan R 10-may-18 end
siteCode = genericUtility.getColumnValue("site_code",headerDom);
//custCode = genericUtility.getColumnValue("cust_code",headerDom);
sdueDate = genericUtility.getColumnValue("due_date",headerDom);
......@@ -1155,12 +1160,12 @@ conn = getConnection();
schqAmount = "";
}
chqAmount = Double.parseDouble(schqAmount);
System.out.println("chq_amount :::::"+ chqAmount);
System.out.println("chq_amount :::::["+ chqAmount+"]");
}
if (childNodeName.equals("cust_code"))
{
custCode = checkNull(childNode.getFirstChild().getNodeValue()).trim();
System.out.println("cust_code :::::"+ custCode);
System.out.println("cust_code :::::["+ custCode+"]");
}
if (childNodeName.equals("remarks"))//added by kunal on 19/10/12
{
......@@ -1170,7 +1175,7 @@ conn = getConnection();
if (childNodeName.equals("adj_amt"))//added by kunal on 19/10/12
{
adjAmt = Double.parseDouble(checkNull(childNode.getFirstChild().getNodeValue()).trim());
System.out.println("adjAmt :::::"+ adjAmt);
System.out.println("adjAmt :::::["+ adjAmt+"]");
totalAdjAmt = totalAdjAmt+adjAmt;// added by nandkumar gadkari on 03/04/18
}
}//inner for
......@@ -1183,7 +1188,7 @@ conn = getConnection();
{
groupCode = rs.getString(1);
}
System.out.println("Group Code ::: "+groupCode);
System.out.println("Group Code ::: ["+groupCode+"]");
rs.close();
pstmt.close();
......@@ -1225,7 +1230,7 @@ conn = getConnection();
receiptMap.put("bank_code",bankCode);//Added by Manoj dtd 03/01/2014
int ele = getListElement(receiptList, searchKey);
//int ele = getListElement(receiptList, chequeNo);
System.out.println("ele::::::::::"+ele);
System.out.println("ele::::::::::["+ele+"]");
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"ele::::::::::"+ele,true);
ReceiptElements receiptElements;
......@@ -1242,7 +1247,7 @@ conn = getConnection();
receiptList.add(receiptElements);
//ele = receiptList.size() -1;
ele = getListElement(receiptList, searchKey);
System.out.println("The size of the element is "+ele);
System.out.println("The size of the element is ["+ele+"]");
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"The size of the element is "+ele,true);
}
......@@ -1258,7 +1263,7 @@ conn = getConnection();
receiptList.set(ele,receiptElements);
}//Outer For
System.out.println("@@@@ The size of receiptList is @@@@ "+receiptList.size());
System.out.println("@@@@ The size of receiptList is @@@@ ["+receiptList.size()+"]");
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"@@@@ The ReceiptGenerated is @@@@ "+receiptList.size(),true);
// If Condittion ADDED BY NANDKUMAR GADKARI on 03/04/18
......@@ -1286,8 +1291,10 @@ conn = getConnection();
for (int Ctr1 = 0; Ctr1 < invSize ; Ctr1++)
{
ReceiptDetail receiptDetail = (ReceiptDetail)invoiceList.get(Ctr1);
System.out.println("receiptDetail.getRcpAmt()["+receiptDetail.getRcpAmt()+"]");
rcpAmount = rcpAmount +receiptDetail.getRcpAmt();
rcpAmount = getRequiredDecimal(rcpAmount,3); // Added by rajesh k to convert number format
System.out.println("---rcpAmount--["+rcpAmount+"]");
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"rcpAmount**********[ "+rcpAmount+"]",true);
}
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"rcpAmount:-[ "+rcpAmount+"]",true);
......@@ -1307,7 +1314,14 @@ conn = getConnection();
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"MITCH MATCH AMOUNT Cheque No["+receiptElements.getChequeNo()+"] TotalChequeAmt ["+chequeAmt+"]",true);
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"RcpAmount:-"+rcpAmount,true);
}
//Added by Pavan R 10-may-18 to inv of one cust and rcp-adv of another cust, with net amount 0, then system no tallowed us to process the trans.
System.out.println("--rcpAmount["+rcpAmount+"]amtFlag["+amtFlag+"]");
if (rcpAmount != 0)
{
returnString= itmDBAccessEJB.getErrorString("","VTRECO6","","",conn);
return returnString;
}
//Added by Pavan R 10-may-18 end
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"TotalReceiptAmount:::-["+rcpAmount+"]",true);
}
......@@ -1351,6 +1365,18 @@ conn = getConnection();
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"No Of Invoice for receipt ["+tranId+"]"+invoiceList.size(),true);
insertReceiptDtl(tranId,invoiceList,conn);
}
//Added by Pavan R 10-may-18 to flag in filter on receivable JV creation, to create a confirmed or unconfirmed JV.
if("Y".equals(jvAutoConf))
{ System.out.println("Pavan---Receipt tran Id ["+tranId+"]");
//ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf();
returnString = rcpAdvConf.confirm(tranId, xtraParams, "", conn);
System.out.println("After receipt adv---->["+returnString+"]");
if(returnString != null && returnString.indexOf("VTCICONF3") != -1)
{
returnString = "";
}
}
//Added by Pavan R 10-may-18 end
}
catch (Exception e)
{
......
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