Skip to content

B
business-java
Commit 73d16713 authored by wansari's avatar wansari
Browse files
Options

D16JBAS001 updated source to print header and detail amount for VTPOST issue 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106173 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0be3f695
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 148 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java
View file @ 73d16713
...@@ -551,36 +551,17 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -551,36 +551,17 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
//do //do
//{ //{
invoiceIDHdr = (String) hdrMap.get("invoice_id"); invoiceIDHdr = (String) hdrMap.get("invoice_id");
countRec = 0; countRec = 0;
sql = " select tran_type from sreturn where tran_id__crn = ? "; sql = " select tran_type from sreturn where tran_id__crn = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDDrcrRcp);
rs = pstmt.executeQuery();
if(rs.next())
{
tranType = checkNullAndTrim(rs.getString("tran_type"));
countRec++;
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
if(countRec > 0)
{
sql = " select inv_type from invoice where invoice_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,invoiceIDHdr); pstmt.setString(1,tranIDDrcrRcp);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
invType = checkNullAndTrim(rs.getString("inv_type")); tranType = checkNullAndTrim(rs.getString("tran_type"));
countRec++;
} }
if(rs != null) if(rs != null)
{ {
...@@ -590,148 +571,167 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -590,148 +571,167 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
}
sql = " select acct_code, cctr_code, sum(tax_amt), line_no, (case when sum(reco_amount) is null then 0 else sum(reco_amount) end) as reco_amount "
+" from taxtran where tran_code = ? and tran_id = ? "
+" and tax_amt <> 0 and effect <> 'N' group by acct_code, cctr_code, line_no ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranSer);
pstmt.setString(2,tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
taxAmt = rs.getString("tax_amt");
lineNo = rs.getString("line_no");
recoAmt = rs.getDouble("reco_amount");
System.out.println("@@acctCode ["+acctCode+"]");
if(acctCode == null || acctCode.trim().length() == 0) if(countRec > 0)
{
sql = " select inv_type from invoice where invoice_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,invoiceIDHdr);
rs = pstmt.executeQuery();
if(rs.next())
{
invType = checkNullAndTrim(rs.getString("inv_type"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
}
sql = " select acct_code, cctr_code, sum(tax_amt), line_no, (case when sum(reco_amount) is null then 0 else sum(reco_amount) end) as reco_amount "
+" from taxtran where tran_code = ? and tran_id = ? "
+" and tax_amt <> 0 and effect <> 'N' group by acct_code, cctr_code, line_no ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranSer);
pstmt.setString(2,tranId);
rs = pstmt.executeQuery();
while(rs.next())
{ {
if("H".equalsIgnoreCase(posType)) acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
taxAmt = rs.getString("tax_amt");
lineNo = rs.getString("line_no");
recoAmt = rs.getDouble("reco_amount");
System.out.println("@@acctCode ["+acctCode+"]");
if(acctCode == null || acctCode.trim().length() == 0)
{ {
//Need to verify below codew if("H".equalsIgnoreCase(posType))
cctrCode = finCommon.getAcctDetrTtype(" ", itemSer, "SRET" , tranType, conn);
//ls_acctcode = f_get_token(ls_cctrcode,'~t');
if (cctrCode != null && cctrCode.trim().length() > 0)
{ {
String tokens [] = cctrCode.split(","); //Need to verify below codew
cctrCode = finCommon.getAcctDetrTtype(" ", itemSer, "SRET" , tranType, conn);
if ( tokens.length >= 2) //ls_acctcode = f_get_token(ls_cctrcode,'~t');
{
acctCode = tokens[0]; if (cctrCode != null && cctrCode.trim().length() > 0)
cctrCode = tokens[1];
}
else
{ {
acctCode = cctrCode.substring(0,cctrCode.indexOf(",")); String tokens [] = cctrCode.split(",");
cctrCode = cctrCode.substring(cctrCode.indexOf(",") + 1);
if ( tokens.length >= 2)
{
acctCode = tokens[0];
cctrCode = tokens[1];
}
else
{
acctCode = cctrCode.substring(0,cctrCode.indexOf(","));
cctrCode = cctrCode.substring(cctrCode.indexOf(",") + 1);
}
} }
} }
} else if("D".equalsIgnoreCase(posType))
else if("D".equalsIgnoreCase(posType))
{
lineNo = lineNo.trim();
sql = " select inv.item_code,i.item_ser from invoice_trace inv,item i "
+" where inv.invoice_id = ? and line_no = ? "
+" and inv.item_code = i.item_code " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,invoiceIDHdr);
pstmt1.setString(2,lineNo);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
itemCode = rs.getString("item_code");
itemSer = rs.getString("item_ser");
}
if(rs1 != null)
{
rs1.close();rs1 = null;
}
if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
//Need to verify below code
cctrCode = finCommon.getAcctDetrTtype(itemCode, itemSer, "SRET", tranType, conn);
//ls_acctcode = f_get_token(ls_cctrcode,'~t')
if (cctrCode != null && cctrCode.trim().length() > 0)
{ {
String tokens [] = cctrCode.split(","); lineNo = lineNo.trim();
if ( tokens.length >= 2) sql = " select inv.item_code,i.item_ser from invoice_trace inv,item i "
+" where inv.invoice_id = ? and line_no = ? "
+" and inv.item_code = i.item_code " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,invoiceIDHdr);
pstmt1.setString(2,lineNo);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{ {
acctCode = tokens[0]; itemCode = rs.getString("item_code");
cctrCode = tokens[1]; itemSer = rs.getString("item_ser");
} }
else if(rs1 != null)
{ {
acctCode = cctrCode.substring(0,cctrCode.indexOf(",")); rs1.close();rs1 = null;
cctrCode = cctrCode.substring(cctrCode.indexOf(",") + 1); }
if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
//Need to verify below code
cctrCode = finCommon.getAcctDetrTtype(itemCode, itemSer, "SRET", tranType, conn);
//ls_acctcode = f_get_token(ls_cctrcode,'~t')
if (cctrCode != null && cctrCode.trim().length() > 0)
{
String tokens [] = cctrCode.split(",");
if ( tokens.length >= 2)
{
acctCode = tokens[0];
cctrCode = tokens[1];
}
else
{
acctCode = cctrCode.substring(0,cctrCode.indexOf(","));
cctrCode = cctrCode.substring(cctrCode.indexOf(",") + 1);
}
} }
} }
} }
}
System.out.println("@@cctrCode ["+cctrCode+"]");
if(cctrCode == null || cctrCode.trim().length() == 0)
{
cctrCode = cctrCodeSal;
}
lsStr = "acct_code = '" + checkNull((acctCode)) + "' and cctr_code = '" + checkNull(cctrCode) + "'"; System.out.println("@@cctrCode ["+cctrCode+"]");
lineNo = String.valueOf(findLineNofromDetail(acctCode, cctrCode ,detailList));
if(cctrCode == null || cctrCode.trim().length() == 0)
{
cctrCode = cctrCodeSal;
}
if(Integer.parseInt(lineNo) == 0) lsStr = "acct_code = '" + checkNull((acctCode)) + "' and cctr_code = '" + checkNull(cctrCode) + "'";
{ lineNo = String.valueOf(findLineNofromDetail(acctCode, cctrCode ,detailList));
//Need to verfiy below code
//li_lineno = lds_det.insertrow(0); if(Integer.parseInt(lineNo) == 0)
//amountTotal = amount; {
detMap = new HashMap(); //Need to verfiy below code
amountTotal = amount; //li_lineno = lds_det.insertrow(0);
} //amountTotal = amount;
else detMap = new HashMap();
{ amountTotal = amount;
//Need to verfiy below code }
//amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount"); else
detMap = (HashMap) detailList.get(Integer.valueOf(lineNo)); {
amountTotal = amount + (Double) detMap.get("amount"); //Need to verfiy below code
} //amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount");
detMap = (HashMap) detailList.get(Integer.valueOf(lineNo));
detMap.put("tran_id", tranId); amountTotal = amount + (Double) detMap.get("amount");
detMap.put("line_no", lineNo); }
detMap.put("acct_code", acctCode);
detMap.put("cctr_code", cctrCode);
detMap.put("amount", amountTotal - recoAmt);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
if(Integer.parseInt(lineNo) == 0) detMap.put("tran_id", tranId);
detMap.put("line_no", lineNo);
detMap.put("acct_code", acctCode);
detMap.put("cctr_code", cctrCode);
detMap.put("amount", amountTotal - recoAmt);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
if(Integer.parseInt(lineNo) == 0)
{
detailList.add(detMap);
}
else
{
detailList.set(Integer.parseInt(lineNo), detMap);
}
total = total + amount;
}
if(rs != null)
{ {
detailList.add(detMap); rs.close();rs = null;
} }
else if(pstmt != null)
{ {
detailList.set(Integer.parseInt(lineNo), detMap); pstmt.close();pstmt = null;
} }
total = total + amount;
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
sql = " select line_no, acct_code__reco, cctr_code__reco, (case when sum(reco_amount) is null then 0 else sum(reco_amount) end) as reco_amount " sql = " select line_no, acct_code__reco, cctr_code__reco, (case when sum(reco_amount) is null then 0 else sum(reco_amount) end) as reco_amount "
...@@ -1201,7 +1201,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1201,7 +1201,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
totalAmountRec = rs1.getDouble("tot_amt"); totalAmountRec = rs1.getDouble("tot_amt");
adjAmountRec = rs1.getDouble("adj_amt"); adjAmountRec = rs1.getDouble("adj_amt");
System.out.println("@@-adjAmountRec["+adjAmountRec+"] adjAmount["+adjAmount+"] totalAmountRec["+totalAmountRec+"] amount["+amount+"] "); System.out.println("@@@-adjAmountRec["+adjAmountRec+"] adjAmount["+adjAmount+"] totalAmountRec["+totalAmountRec+"] amount["+amount+"] ");
if(Math.abs(adjAmountRec + adjAmount ) > Math.abs(totalAmountRec)) if(Math.abs(adjAmountRec + adjAmount ) > Math.abs(totalAmountRec))
{ {
//Need to check this error code //Need to check this error 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