Skip to content

B
business-java
Commit 1d947c1a authored by cpatil's avatar cpatil
Browse files
Options

add condition discdt != null @line no 1558 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98486 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d59fe9f1
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
webitm-fin/ibase/webitm/ejb/fin/AutoPmtGenPrc.java
View file @ 1d947c1a
......@@ -13,7 +13,7 @@ import java.sql.*;
import java.text.*;
import java.io.*;
import org.apache.poi.hssf.record.formula.functions.Abs;
//import org.apache.poi.hssf.record.formula.functions.Abs; //commented on 18/08/15
import org.w3c.dom.*;
import javax.xml.parsers.*;
import javax.ejb.*;
......@@ -1087,7 +1087,7 @@ System.out.println("Getting winName============"+windowName);
}
System.out.println("Getting combination As====="+tempSplitCode);
System.out.println("1090Getting combination As====="+tempSplitCode);
System.out.println("Getting splitCodeWiseMap====="+splitCodeWiseMap);
if(splitCodeWiseMap.containsKey(tempSplitCode))
{
......@@ -1140,7 +1140,7 @@ System.out.println("Getting winName============"+windowName);
rs = null;
pstmt.close();
pstmt = null;
System.out.println("sfld1========="+sfld1);
System.out.println("1143sfld1========="+sfld1);
sql="select crtermfc.fin_chg,crterm.acct_code__disc,crterm.cctr_code__disc,crterm.start_from from crterm,crtermfc " +
"where crtermfc.cr_term = crterm.cr_term and crterm.cr_term = ? and trim(crtermfc.line_no) = '1'";
......@@ -1168,7 +1168,7 @@ System.out.println("Getting winName============"+windowName);
reDate1 = sdf.parse(refDate);
Date discdt=getDiscountdate(sfld1, reDate1, effDate, billDt, conn);
System.out.println("Getting discdt======"+discdt);
System.out.println("1171Getting discdt======"+discdt);
if(discdt!=null)
{
System.out.println("Getting discdt not null==");
......@@ -1219,7 +1219,7 @@ System.out.println("Getting winName============"+windowName);
if((payDate!=null && payDate.trim().length()>0) && ldStartDate!=null)
{
payDate1 = sdf.parse(payDate);
System.out.println("@@@1222payDate1["+payDate1+"]ldStartDate["+ldStartDate+"]discdt["+discdt+"]");
if((payDate1!=null && payDate1.compareTo(ldStartDate)>0)&& (discdt!=null && payDate1.compareTo(discdt)<0))
{
if(discount!=0)
......@@ -1300,7 +1300,7 @@ System.out.println("Getting winName============"+windowName);
System.out.println("Getting value in Map======"+tempMap);
tempList.add(tempMap);
System.out.println("Getting tempList value after ading in list ======"+tempList);
System.out.println("1303Getting tempList value after ading in list ======"+tempList);
if(splitCodeWiseMap.containsKey(tempSplitCode))
{
......@@ -1316,7 +1316,7 @@ System.out.println("Getting winName============"+windowName);
}
System.out.println("Sundry Code===="+sundryCode);
System.out.println("1319Sundry Code===="+sundryCode);
ArrayList<String > sundryCodeList=new ArrayList<String>();
......@@ -1324,7 +1324,7 @@ System.out.println("Getting winName============"+windowName);
double sumNetAmt=0.0,totUnconfAmt=0;
String autoPaymTranId="";
Set setItem = splitCodeWiseMap.entrySet();
System.out.println("getting set item====="+setItem);
System.out.println("1327getting set item====="+setItem);
tempList = null;
Iterator itrItem = setItem.iterator();
int testCnt=0;
......@@ -1332,7 +1332,7 @@ System.out.println("Getting winName============"+windowName);
{
testCnt++;
//sumNetAmt=0;
System.out.println("while loop@@@@@@@ "+testCnt);
System.out.println("1335while loop@@@@@@@ "+testCnt);
Map.Entry itemMapEntry = (Map.Entry)itrItem.next();
splitCode = (String)itemMapEntry.getKey();
System.out.println("splitCode---"+splitCode);
......@@ -1381,8 +1381,8 @@ System.out.println("Getting winName============"+windowName);
System.out.println("Getting ref due Date for header===="+dueMaxDate);
System.out.println("sfld1========="+sfld1);
System.out.println("1384Getting ref due Date for header===="+dueMaxDate);
System.out.println("1385sfld1========="+sfld1);
......@@ -1413,7 +1413,7 @@ System.out.println("Getting winName============"+windowName);
}
System.out.println("Currency_code==================="+currCode);
System.out.println("1416Currency_code==================="+currCode);
System.out.println("Site_code==================="+siteCode);
//addd on 10/07/15***FIRST NEGATIVE MAP CREATED HERE ENDED HERE AND ENDED HERE
......@@ -1462,7 +1462,7 @@ System.out.println("Getting winName============"+windowName);
billDateNeg=rs.getDate("bill_date");
// pay_amt=rs.getDouble(3);
System.out.println("Sundry Code===="+sundryCode+"Refr No===="+refNo+"Due Date===="+dueDatediff+"pay_amt==="+pay_amt);
System.out.println("1465Sundry Code===="+sundryCode+"Refr No===="+refNo+"Due Date===="+dueDatediff+"pay_amt==="+pay_amt);
......@@ -1482,7 +1482,7 @@ System.out.println("Getting winName============"+windowName);
tempListNeg = new ArrayList();
System.out.println("Not Exist for SundryCd Spilt combo======"+tempListNeg);
}
System.out.println(" records in tempListNeg======"+tempListNeg);
System.out.println("1485:records in tempListNeg======"+tempListNeg);
sql="select purc_order,eff_date,bill_date from voucher where tran_id = ?";
......@@ -1499,7 +1499,7 @@ System.out.println("Getting winName============"+windowName);
rs1 = null;
pstmt1.close();
pstmt1 = null;
System.out.println("Purchase order========="+porder);
System.out.println("1502Purchase order========="+porder);
System.out.println("effDate========="+effDate);
System.out.println("billDt========="+billDt);
......@@ -1515,7 +1515,7 @@ System.out.println("Getting winName============"+windowName);
rs1 = null;
pstmt1.close();
pstmt1 = null;
System.out.println("sfld1========="+sfld1);
System.out.println("1518sfld1========="+sfld1);
sql="select crtermfc.fin_chg,crterm.acct_code__disc,crterm.cctr_code__disc,crterm.start_from from crterm,crtermfc " +
"where crtermfc.cr_term = crterm.cr_term and crterm.cr_term = ? and trim(crtermfc.line_no) = '1'";
......@@ -1543,10 +1543,10 @@ System.out.println("Getting winName============"+windowName);
reDate1 = sdf.parse(refDate);
Date discdt=getDiscountdate(sfld1, reDate1, effDate, billDt, conn);
System.out.println("Getting discdt======"+discdt);
System.out.println("1546Getting discdt======"+discdt);
if(discdt!=null)
{
System.out.println("Getting discdt not null==");
System.out.println("1549Getting discdt not null==");
String discdt1=sdf.format(discdt);
System.out.println("Getting discdt================"+discdt1);
mPayDate=sdf.parse(transactionDate);
......@@ -1571,13 +1571,13 @@ System.out.println("Getting winName============"+windowName);
pstmt1.close();
pstmt1 = null;
System.out.println("Get Discount======="+discount);
System.out.println("1574Get Discount======="+discount);
if(discount==0)
{
discount=0;
}
System.out.println(">>>>>>>>startFrom==="+startFrom);
System.out.println("1580>>>>>>>>startFrom==="+startFrom);
if((startFrom!=null && startFrom.trim().length()>0) && "R".equalsIgnoreCase(startFrom))
{
ldStartDate=reDate1;
......@@ -1594,11 +1594,12 @@ System.out.println("Getting winName============"+windowName);
if((payDate!=null && payDate.trim().length()>0) && ldStartDate!=null)
{
payDate1 = sdf.parse(payDate);
if((payDate1!=null && payDate1.compareTo(ldStartDate)>0)&& payDate1.compareTo(discdt)<0)
System.out.println("@@@1597payDate1["+payDate1+"]ldStartDate["+ldStartDate+"]discdt["+discdt+"]");
if((payDate1!=null && payDate1.compareTo(ldStartDate)>0)&& ( discdt != null && payDate1.compareTo(discdt)<0))
{
if(discount!=0)
{System.out.println("Discount not equals to Zerooooooooooooo");
{
System.out.println("1602Discount not equals to Zerooooooooooooo");
payAmt1=Double.parseDouble(payAmt);
disAmt= payAmt1 *(discount/100);
}
......@@ -1606,25 +1607,25 @@ System.out.println("Getting winName============"+windowName);
}
System.out.println("disAmount=========="+disAmt);
System.out.println("1610disAmount=========="+disAmt);
System.out.println("PayMAode======="+payMode);
System.out.println("BankCode>>>>>==="+bankCode);
if("D".equalsIgnoreCase(payMode)||"P".equalsIgnoreCase(payMode))
{
System.out.println("payMode<<<<<<<<");
System.out.println("1615payMode<<<<<<<<");
drawnAt=checkNull(getpayablesAt(sundryType, sundryCode, bankCode, conn));
}
if("D".equalsIgnoreCase(payMode)||"P".equalsIgnoreCase(payMode)||"T".equalsIgnoreCase(payMode)||"N".equalsIgnoreCase(payMode))
{
System.out.println("payMode========>>>>");
System.out.println("1622payMode========>>>>");
stanCode=checkNull(getStanDraw(sundryType, sundryCode, conn));
System.out.println("Getting stanCode=============="+stanCode);
}
System.out.println("vouch_no============"+refNo);
System.out.println("1628vouch_no============"+refNo);
System.out.println("vouch_date============"+refDate);
System.out.println("payAmt============"+payAmt);
......@@ -1633,7 +1634,7 @@ System.out.println("Getting winName============"+windowName);
double payAmount=Double.parseDouble(payAmt);
double exchRate1=Double.parseDouble(exchRate);
diffAmt=((payAmount * exchRate1)-(payAmount*mexrate));
System.out.println("diff_amt__exch========="+diffAmt);
System.out.println("1637diff_amt__exch========="+diffAmt);
//added by priyanka on 09/07/15
tempMapNeg = new HashMap();
......
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