Skip to content

B
business-java
Commit 472f91f4 authored by msalla's avatar msalla
Browse files
Options

Invoice cancellation testing with sales return. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215432 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 647866b0
Show whitespace changes
Inline Side-by-side
Showing with 1202 additions and 894 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java
View file @ 472f91f4
...@@ -45,13 +45,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -45,13 +45,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
{ {
String retString = ""; String retString = "";
Connection conn = null; Connection conn = null;
System.out.println("DrCrRcpConf conn1........"+conn);
try try
{ {
retString = confirm( tranID, xtraParams, forcedFlag, conn ); retString = confirm( tranID, xtraParams, forcedFlag, conn );
System.out.println("DrCrRcpConf 5........"+conn);
/*if ( retString != null && retString.length() > 0 ) /*if ( retString != null && retString.length() > 0 )
{ {
throw new Exception("Exception while calling DrCrRcpConf confirm for tran Id:["+tranID+"]"); throw new Exception("Exception while calling DrCrRcpConf confirm for tran Id:["+tranID+"]");
...@@ -67,11 +68,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -67,11 +68,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
public String confirm(String tranId, String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException public String confirm(String tranId, String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException
{ {
System.out.println("DrCrRcpConf Confirm called........"); System.out.println("DrCrRcpConf Confirm called........"+conn);
String sql = ""; String sql = "";
String confirm = ""; String confirm = "";
String siteCode = ""; String siteCode = "";
String errString = "" ; String errString = "" ;
String errCode="";
String loginEmpCode = ""; String loginEmpCode = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -81,11 +83,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -81,11 +83,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
try try
{ {
//System.out.println("DrCrRcpConf 1........"+conn);
if (conn == null) if (conn == null)
{ {
conn = getConnection(); conn = getConnection();
connStatus = true; connStatus = true;
} }
//System.out.println("DrCr conn22........"+conn);
finCommon = new FinCommon(); finCommon = new FinCommon();
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
...@@ -140,7 +145,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -140,7 +145,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
errString = retrieveDrCrRcp (tranId,siteCode,xtraParams,conn); errString = retrieveDrCrRcp (tranId,siteCode,xtraParams,conn);
System.out.println("Return String from retrieveDrCrRcp ["+errString+"]"); //System.out.println("Return String from retrieveDrCrRcp ["+errString+"]");
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -162,7 +167,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -162,7 +167,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(2, loginEmpCode); pstmt.setString(2, loginEmpCode);
pstmt.setString(3, tranId); pstmt.setString(3, tranId);
int updateCoount = pstmt.executeUpdate(); int updateCoount = pstmt.executeUpdate();
System.out.println("Rows Updated= "+updateCoount); //System.out.println("Rows Updated= "+updateCoount);
if(pstmt != null) if(pstmt != null)
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
...@@ -183,17 +188,36 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -183,17 +188,36 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
else else
{ {
System.out.println("The Selected transaction is already confirmed and can not be edited"); //System.out.println("The Selected transaction is already confirmed and can not be edited");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString; return errString;
} }
System.out.println("Error String from confirm method.....[" + errString + "]"); //System.out.println("Error String from confirm method.....[" + errString + "]");
} }
catch( Exception e) catch( Exception e)
{ {
System.out.println("Exception inside DrCrRcpConf Confirm==>"+e.getMessage()); System.out.println("Exception inside DrCrRcpConf Confirm==>"+e.getMessage());
//added by monika--16 -jan-2019 -If local connection is used then transaction get rollbacked in try block][Start]
if(conn!=null)
{
try
{
if(connStatus)
{
conn.rollback();
}
}
catch (SQLException ex)
{
e.printStackTrace();
throw new ITMException(e);
}
}
//end
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
...@@ -266,7 +290,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -266,7 +290,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
try try
{ {
System.out.println("Inside gbfRetrieveDrCrRcp.....tranId["+tranId+"] siteCode["+siteCode+"]"); //System.out.println("Inside gbfRetrieveDrCrRcp.....tranId["+tranId+"] siteCode["+siteCode+"] connection 55"+conn);
today = new java.sql.Timestamp(System.currentTimeMillis()) ; today = new java.sql.Timestamp(System.currentTimeMillis()) ;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -297,7 +321,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -297,7 +321,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
tranIDDrcrRcp = tranIDList.get(i); tranIDDrcrRcp = tranIDList.get(i);
System.out.println("TranID is--->["+tranIDDrcrRcp+"]"); //System.out.println("TranID is--->["+tranIDDrcrRcp+"]");
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
...@@ -393,6 +417,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -393,6 +417,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
hdrMap.put("line_billback_amt", rs.getDouble("line_billback_amt")); hdrMap.put("line_billback_amt", rs.getDouble("line_billback_amt"));
hdrMap.put("line_offinv_amt", rs.getDouble("line_offinv_amt")); hdrMap.put("line_offinv_amt", rs.getDouble("line_offinv_amt"));
hdrMap.put("edi_stat", rs.getString("edi_stat")); hdrMap.put("edi_stat", rs.getString("edi_stat"));
//System.out.println("select line_no, acct_code__reco, cctr_code__reco,"+ rs.getDouble("amount")+"amount bc in hdr@@"+ rs.getString("amount__bc")+"");
} }
if(rs != null) if(rs != null)
{ {
...@@ -483,7 +509,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -483,7 +509,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
System.out.println("acctCodeSal["+acctCodeSal+"]--cctrCodeSal["+cctrCodeSal+"]--cctrCodeAr["+cctrCodeAr+"]"); //System.out.println("acctCodeSal["+acctCodeSal+"]--cctrCodeSal["+cctrCodeSal+"]--cctrCodeAr["+cctrCodeAr+"]");
if(cctrCodeSal == null || cctrCodeSal.length() == 0) if(cctrCodeSal == null || cctrCodeSal.length() == 0)
{ {
...@@ -497,7 +523,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -497,7 +523,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
siteCode = (String) hdrMap.get("site_code"); siteCode = (String) hdrMap.get("site_code");
} }
System.out.println("PosType["+posType+"]"); //System.out.println("PosType["+posType+"]");
if("CRNRCP".equalsIgnoreCase(tranSer.trim())) if("CRNRCP".equalsIgnoreCase(tranSer.trim()))
{ {
...@@ -546,7 +572,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -546,7 +572,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
hdrMap.put("tran_date", tranDate); hdrMap.put("tran_date", tranDate);
} }
System.out.println("DetailCount-->"+dtlCount); //System.out.println("DetailCount-->"+dtlCount);
if(dtlCount == 0) if(dtlCount == 0)
{ {
//do //do
...@@ -607,7 +633,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -607,7 +633,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
lineNo = rs.getString("line_no"); lineNo = rs.getString("line_no");
recoAmt = rs.getDouble("reco_amount"); recoAmt = rs.getDouble("reco_amount");
System.out.println("@@acctCode ["+acctCode+"]"); // System.out.println("@@acctCode ["+acctCode+"]"+"recoamt intaxtran"+recoAmt);
if(acctCode == null || acctCode.trim().length() == 0) if(acctCode == null || acctCode.trim().length() == 0)
{ {
...@@ -679,7 +705,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -679,7 +705,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
} }
System.out.println("@@cctrCode ["+cctrCode+"]"); // System.out.println("@@cctrCode ["+cctrCode+"]");
if(cctrCode == null || cctrCode.trim().length() == 0) if(cctrCode == null || cctrCode.trim().length() == 0)
{ {
...@@ -688,8 +714,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -688,8 +714,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
lsStr = "acct_code = '" + checkNull((acctCode)) + "' and cctr_code = '" + checkNull(cctrCode) + "'"; lsStr = "acct_code = '" + checkNull((acctCode)) + "' and cctr_code = '" + checkNull(cctrCode) + "'";
lineNo = String.valueOf(findLineNofromDetail(acctCode, cctrCode ,detailList)); lineNo = String.valueOf(findLineNofromDetail(acctCode, cctrCode ,detailList));
// System.out.println("Inside detail new hashmap"+amountTotal+"recoamt@@"+recoAmt);
System.out.println("line No from detail"+lineNo); // System.out.println("line No from detail"+lineNo);
if(Integer.parseInt(lineNo) == 0) if(Integer.parseInt(lineNo) == 0)
{ {
...@@ -705,15 +732,15 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -705,15 +732,15 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap.put("amount", amountTotal - recoAmt); detMap.put("amount", amountTotal - recoAmt);
detMap.put("emp_code", ""); detMap.put("emp_code", "");
detMap.put("anal_code", ""); detMap.put("anal_code", "");
System.out.println("Inside detail new hashmap"+amountTotal); // System.out.println("Inside detail new hashmap"+amountTotal);
} }//
else else
{ {
//Need to verfiy below code //Need to verfiy below code
//amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount"); //amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount");
detMap = (HashMap) detailList.get(Integer.valueOf(lineNo)); detMap = (HashMap) detailList.get(Integer.valueOf(lineNo));
amountTotal = Double.parseDouble(taxAmt) + (Double) detMap.get("amount"); amountTotal = Double.parseDouble(taxAmt) + (Double) detMap.get("amount");
System.out.println("Inside add detail map"+amountTotal+"DetailList"+detailList); //System.out.println("Inside add detail map"+amountTotal+"DetailList"+detailList);
} }
...@@ -721,12 +748,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -721,12 +748,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
if(Integer.parseInt(lineNo) == 0) if(Integer.parseInt(lineNo) == 0)
{ {
detailList.add(detMap); detailList.add(detMap);
System.out.println("DetailList added MAP"+detailList); // System.out.println("DetailList added MAP"+detailList);
} }
else else
{ {
detailList.set(Integer.parseInt(lineNo), detMap); detailList.set(Integer.parseInt(lineNo), detMap);
System.out.println(""); // System.out.println("");
} }
total = total + amount; total = total + amount;
...@@ -756,7 +783,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -756,7 +783,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
cctrReco = rs.getString("cctr_code__reco"); cctrReco = rs.getString("cctr_code__reco");
recoAmount = rs.getDouble("reco_amount"); recoAmount = rs.getDouble("reco_amount");
System.out.println("@@acctReco ["+acctReco+"]"); //System.out.println("@@acctReco ["+acctReco+"]"+"receoamount@@"+recoAmount);
if(acctReco == null || acctReco.trim().length() == 0) if(acctReco == null || acctReco.trim().length() == 0)
{ {
...@@ -825,7 +852,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -825,7 +852,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
return errCode; return errCode;
} }
System.out.println("@@cctrReco["+cctrReco+"]"); //System.out.println("@@cctrReco["+cctrReco+"]");
if(cctrReco == null || cctrReco.trim().length() == 0) if(cctrReco == null || cctrReco.trim().length() == 0)
{ {
...@@ -851,6 +878,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -851,6 +878,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
detMap = (HashMap) detailList.get(Integer.valueOf(taxRows)); detMap = (HashMap) detailList.get(Integer.valueOf(taxRows));
amount = (Double) detMap.get("amount"); amount = (Double) detMap.get("amount");
//System.out.println("amount in detail map ["+amount+"] recoamt in detail"+recoAmt);
detMap.put("amount", amount + recoAmt); detMap.put("amount", amount + recoAmt);
detailList.set(taxRows, detMap); detailList.set(taxRows, detMap);
} }
...@@ -972,7 +1000,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -972,7 +1000,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountTotal = amount + (Double) detMap.get("amount"); amountTotal = amount + (Double) detMap.get("amount");
} }
System.out.println("**amountTotal["+amountTotal+"] amount["+amount+"] and Map amount["+(Double) detMap.get("amount")+"]"); //System.out.println("**amountTotal["+amountTotal+"] amount["+amount+"] and Map amount["+(Double) detMap.get("amount")+"]");
detMap.put("tran_id", tranId); detMap.put("tran_id", tranId);
detMap.put("line_no", lineNo); detMap.put("line_no", lineNo);
...@@ -982,7 +1010,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -982,7 +1010,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap.put("emp_code", ""); detMap.put("emp_code", "");
detMap.put("anal_code", ""); detMap.put("anal_code", "");
System.out.println("LINE NUMBER IS["+lineNo+"]"); //System.out.println("amountin detail NUMBER IS["+detMap.get("amount")+"]");
//System.out.println("LINE NUMBER IS["+lineNo+"]");
if(Integer.parseInt(lineNo) == 0) if(Integer.parseInt(lineNo) == 0)
{ {
detailList.add(detMap); detailList.add(detMap);
...@@ -1002,13 +1031,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1002,13 +1031,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
//System.out.println("@amount@@["+hdrMap.get("amount"));
roundAdj = (Double) hdrMap.get("round_adj"); roundAdj = (Double) hdrMap.get("round_adj");
amountHdr = (Double) hdrMap.get("amount"); amountHdr = (Double) hdrMap.get("amount");
exchRate = (Double) hdrMap.get("exch_rate"); exchRate = (Double) hdrMap.get("exch_rate");
amountHdr1 = amountHdr; amountHdr1 = amountHdr;
System.out.println("@roundAdj["+roundAdj+"]"); //System.out.println("@roundAdj["+roundAdj+"]");
if(roundAdj == 0) if(roundAdj == 0)
{ {
...@@ -1016,14 +1046,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1016,14 +1046,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
roundOff = (String) hdrMap.get("rnd_off"); roundOff = (String) hdrMap.get("rnd_off");
amountHdr1 = amountHdr; amountHdr1 = amountHdr;
System.out.println("@roundOff["+roundOff+"]"); //System.out.println("@roundOff["+roundOff+"]");
if(!"N".equals(roundOff)) if(!"N".equals(roundOff))
{ {
roundTo = (Double)hdrMap.get("rnd_to"); roundTo = (Double)hdrMap.get("rnd_to");
amountHdr = distCommon.getRndamt(amountHdr1, roundOff, roundTo); amountHdr = distCommon.getRndamt(amountHdr1, roundOff, roundTo);
} }
System.out.println("@amountHdr["+amountHdr+"] amountHdr1["+amountHdr1+"]"); //System.out.println("@amountHdr["+amountHdr+"] amountHdr1["+amountHdr1+"]");
if(amountHdr != amountHdr1) if(amountHdr != amountHdr1)
{ {
updRowCnt = 0; updRowCnt = 0;
...@@ -1055,7 +1085,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1055,7 +1085,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
roundAdj = (Double) hdrMap.get("round_adj"); roundAdj = (Double) hdrMap.get("round_adj");
System.out.println("@@roundAdj["+roundAdj+"]"); //System.out.println("@@roundAdj["+roundAdj+"]@@amount["+hdrMap.get("amount")+"]@@amountbc--"+hdrMap.get("amount__bc"));
if(roundAdj != 0) if(roundAdj != 0)
{ {
...@@ -1069,7 +1099,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1069,7 +1099,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
return errCode; return errCode;
} }
System.out.println("@@cctrRnd["+cctrRnd+"]"); //System.out.println("@@cctrRnd["+cctrRnd+"]");
if(cctrRnd == null || cctrRnd.length() == 0 || " ".equals(cctrRnd)) if(cctrRnd == null || cctrRnd.length() == 0 || " ".equals(cctrRnd))
{ {
...@@ -1091,11 +1121,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1091,11 +1121,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detailList.set(Integer.valueOf(lineNo), detMap); detailList.set(Integer.valueOf(lineNo), detMap);
} }
//System.out.println("inside while loop ["+amount+"]");
} }
//} //}
//while(true); //while(true);
System.out.println("After while loop ["+errCode+"]"); //System.out.println("After while loop ["+errCode+"]");
if(errCode != null && errCode.trim().length() > 0) if(errCode != null && errCode.trim().length() > 0)
{ {
return errCode; return errCode;
...@@ -1104,23 +1136,25 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1104,23 +1136,25 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
total = 0; total = 0;
dtlCount = detailList.size(); dtlCount = detailList.size();
System.out.println("@@dtlCount["+dtlCount+"]"); //System.out.println("@@dtlCount["+dtlCount+"]");
for(int x = 0; x < dtlCount; x++) for(int x = 0; x < dtlCount; x++)
{ {
detMap = (HashMap) detailList.get(x); detMap = (HashMap) detailList.get(x);
amountDet = (Double) detMap.get("amount"); amountDet = (Double) detMap.get("amount");
System.out.println("amountDet["+amountDet+"]"); //System.out.println("amountDet from detail["+detMap.get("amount")+"]"+"amountDet["+amountDet+"]");
total = total + amountDet; total = total + amountDet;
} }
amountHdr = (Double) hdrMap.get("amount"); amountHdr = (Double) hdrMap.get("amount");
System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]"); //System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 ) if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{ {
//System.out.println("inside if condition total != amountHdr ");
//errCode = "VTPOST2"; //errCode = "VTPOST2";
errCode = itmDBAccessEJB.getErrorString("","VTPOST2","","",conn); errCode = itmDBAccessEJB.getErrorString("","VTPOST2","","",conn);
return errCode; return errCode;
...@@ -1142,6 +1176,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1142,6 +1176,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
adjMap.put("ref_bal_amt", rs.getDouble("ref_bal_amt")); adjMap.put("ref_bal_amt", rs.getDouble("ref_bal_amt"));
adjMap.put("adj_amt", rs.getDouble("adj_amt")); adjMap.put("adj_amt", rs.getDouble("adj_amt"));
adjMap.put("mrp_value__adj", rs.getString("mrp_value__adj")); adjMap.put("mrp_value__adj", rs.getString("mrp_value__adj"));
//System.out.println("drcr_adjamount---="+rs.getDouble("adj_amt"));
adjList.add(adjMap); adjList.add(adjMap);
} }
...@@ -1157,7 +1192,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1157,7 +1192,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
adjCount = adjList.size(); adjCount = adjList.size();
total = 0; total = 0;
System.out.println("drcr_rcpinv Count="+adjCount); //System.out.println("drcr_rcpinv Count="+adjCount);
for(int x = 0; x < adjCount; x++) for(int x = 0; x < adjCount; x++)
{ {
...@@ -1168,7 +1203,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1168,7 +1203,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
adjAmount = (Double) adjMap.get("adj_amt"); adjAmount = (Double) adjMap.get("adj_amt");
total = total + adjAmount; total = total + adjAmount;
//System.out.println("drcr_ADJAMOUNT--"+adjAmount+"TOTAL--"+total);
sql = " select count(*) from receivables where cust_code = ? and tran_ser = ? and ref_no = ? " ; sql = " select count(*) from receivables where cust_code = ? and tran_ser = ? and ref_no = ? " ;
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,custCode); pstmt1.setString(1,custCode);
...@@ -1188,7 +1223,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1188,7 +1223,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt1.close();pstmt1 = null; pstmt1.close();pstmt1 = null;
} }
System.out.println("countRcv ["+countRcv+"]"); //System.out.println("countRcv ["+countRcv+"]");
if(countRcv == 0) if(countRcv == 0)
{ {
//return errCode;//Need to verify //return errCode;//Need to verify
...@@ -1208,9 +1243,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1208,9 +1243,11 @@ 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))//COMMENTED BY MONIKA
//if(Math.abs(adjAmountRec + amount ) > Math.abs(totalAmountRec))
{ {
//System.out.println("Math.abs(adjAmountRec + amount )>totalAmountRec");
//Need to check this error code //Need to check this error code
//errCode = "The tot_amt - adj_amt in receivables table should be more than or equal to the adj_amt in detail."; //errCode = "The tot_amt - adj_amt in receivables table should be more than or equal to the adj_amt in detail.";
errCode = itmDBAccessEJB.getErrorString("","VTPOST2","","",conn); errCode = itmDBAccessEJB.getErrorString("","VTPOST2","","",conn);
...@@ -1229,7 +1266,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1229,7 +1266,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amount = (Double)hdrMap.get("amount"); amount = (Double)hdrMap.get("amount");
System.out.println("@@--amount["+amount+"] total["+total+"]"); //System.out.println("@@--amount["+amount+"] total["+total+"]");
if(amount < 0 && total <= 0) if(amount < 0 && total <= 0)
{ {
...@@ -1270,7 +1307,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1270,7 +1307,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountHdr = (Double)hdrMap.get("amount"); amountHdr = (Double)hdrMap.get("amount");
System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]"); //System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 ) if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{ {
...@@ -1285,7 +1322,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1285,7 +1322,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
catch(Exception e) catch(Exception e)
{ {
System.out.println("Exception inside gbfRetrieveDrCrRcp==>"+e.getMessage()); //System.out.println("Exception inside gbfRetrieveDrCrRcp==>"+e.getMessage());
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
...@@ -1316,7 +1353,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1316,7 +1353,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
} }
System.out.println("Returning errorCode from gbfRetrieveDrCrRcp ["+errCode+"]"); //System.out.println("Returning errorCode from gbfRetrieveDrCrRcp ["+errCode+"]");
return errCode; return errCode;
} }
...@@ -1337,19 +1374,20 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1337,19 +1374,20 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
Timestamp refDate = null,dueDate = null,custRefDate = null,gpDate = null; Timestamp refDate = null,dueDate = null,custRefDate = null,gpDate = null;
String currCode = "",acctCode = "",cctrCode = "",autoRcp = "",bankCode = "",recd = "",refType = "", String currCode = "",acctCode = "",cctrCode = "",autoRcp = "",bankCode = "",recd = "",refType = "",
crTerm = "",itemSer = "",salesPers = "",salesPers1 = "",salesPers2 = "",custRefNo = "",gpNo = "",chgUser = "",chgTerm = "",invoiceID = ""; crTerm = "",itemSer = "",salesPers = "",salesPers1 = "",salesPers2 = "",custRefNo = "",gpNo = "",chgUser = "",chgTerm = "",invoiceID = "";
double exchRate = 0,discount = 0,taxAmount = 0,custRefAmount = 0,amountBc = 0; double exchRate = 0,discount = 0,taxAmount = 0,custRefAmount = 0,amountBc = 0,cnt=0;
String finEntityFrom = "",finEntityTo = ""; String finEntityFrom = "",finEntityTo = "",confirmed="";
double amount = 0; double amount = 0;
boolean adjInvoice = false; boolean adjInvoice = false;
boolean bIbca=false;
Map keyStoreMap = null; Map keyStoreMap = null;
String statusIBCA="",tranSerRcb="";
try try
{ {
System.out.println("Inside gbf_post_drcr_rcp....tranId["+tranId+"]"); //System.out.println("Inside gbf_post_drcr_rcp....tranId["+tranId+"]");
chgUser = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chg_user"))); chgUser = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")));
chgTerm = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chg_term"))); chgTerm = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm")));
loginSiteCode = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"))); loginSiteCode = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode")));
tranDate = new java.sql.Timestamp(System.currentTimeMillis()); tranDate = new java.sql.Timestamp(System.currentTimeMillis());
...@@ -1375,15 +1413,16 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1375,15 +1413,16 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
retString = postDrCrRcpHdr(tranId, hdrMap, detailList, xtraParams, conn); retString = postDrCrRcpHdr(tranId, hdrMap, detailList, xtraParams, conn);
System.out.println("After gbfPostRcphdr---->["+retString+"]"); //System.out.println("After gbfPostRcphdr---->["+retString+"]");
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
{ {
return retString; return retString;
} }
else else
{ {
retString = postDrCrRcpDet(tranId, hdrMap, detailList , xtraParams, conn); retString = postDrCrRcpDet(tranId, hdrMap, detailList , xtraParams, conn);
System.out.println("After gbfPostRcpdet---->["+retString+"]"); //System.out.println("After gbfPostRcpdet---->["+retString+"]");
} }
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
...@@ -1393,7 +1432,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1393,7 +1432,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
else else
{ {
retString = postDrCrRcpAdjDet(tranId, hdrMap, adjList, xtraParams, conn); retString = postDrCrRcpAdjDet(tranId, hdrMap, adjList, xtraParams, conn);
System.out.println("After gbf_post_drcr_adjdet---->["+retString+"]"); //System.out.println("After gbf_post_drcr_adjdet---->["+retString+"]");
} }
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
...@@ -1407,7 +1446,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1407,7 +1446,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
sretFullRetType = checkNullAndTrim(distCommon.getDisparams("999999","SRET_FULL_TRANTYPE",conn)); sretFullRetType = checkNullAndTrim(distCommon.getDisparams("999999","SRET_FULL_TRANTYPE",conn));
System.out.println("sretFullRetType["+sretFullRetType+"]"); //System.out.println("sretFullRetType["+sretFullRetType+"]");
if("NULLFOUND".equals(sretFullRetType) || sretFullRetType.length() > 0) if("NULLFOUND".equals(sretFullRetType) || sretFullRetType.length() > 0)
{ {
adjInvoice = true; adjInvoice = true;
...@@ -1433,12 +1472,82 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1433,12 +1472,82 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
rs.close();rs = null; rs.close();rs = null;
} }
//added by monika jan 9 2020
invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn));
//System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen))
{
invIbcaGen = "Y";
}
else if("N".equals(invIbcaGen))
{
bIbca=false;
}
else
{
bIbca=true;
custCode = (String) hdrMap.get("cust_code");
siteCode = (String) hdrMap.get("site_code");
sql = " select site_customer.site_code__rcp from site_customer "
+ " where ( site_customer.site_code = ? ) and ( site_customer.cust_code = ? ) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,custCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeRcv = checkNullAndTrim(rs.getString("site_code__rcp"));
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
if(rs != null)
{
rs.close();rs = null;
}
if(siteCodeRcv.length() == 0)
{
sql = " select site_code__rcp from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeRcv = checkNullAndTrim(rs.getString("site_code__rcp"));
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
if(rs != null)
{
rs.close();rs = null;
}
}
System.out.println("adjInvoice["+adjInvoice+"]"); if(siteCodeRcv.length() == 0)
if(adjInvoice)
{ {
siteCodeRcv = siteCode ;
}
//added by monika 9 jan 2020
if(siteCodeRcv.equals(siteCode))
{
bIbca=false;
}
}
System.out.println("adjInvoice["+adjInvoice+"] INVOICE IBCA"+invIbcaGen+" ]");
if(adjInvoice && !bIbca)
{
retString = invoiceDrCrAdj (tranId , xtraParams, conn); retString = invoiceDrCrAdj (tranId , xtraParams, conn);
System.out.println("After gbf_invoice_drcr_adj---->["+retString+"]"); //System.out.println("After gbf_invoice_drcr_adj---->["+retString+"]");
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
{ {
return retString; return retString;
...@@ -1446,19 +1555,47 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1446,19 +1555,47 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
postOnline = checkNullAndTrim(finCommon.getFinparams("999999", "POST_ON_LINE", conn)); postOnline = checkNullAndTrim(finCommon.getFinparams("999999", "POST_ON_LINE", conn));
System.out.println("PostOnline["+postOnline+"]"); //System.out.println("PostOnline["+postOnline+"]");
if("Y".equals(postOnline)) if("Y".equals(postOnline))
{ {
retString = finCommon.checkGlTranDrCr(refSerHdr, tranId, conn); retString = finCommon.checkGlTranDrCr(refSerHdr, tranId, conn);
} }
//addedd by monika to check retstring==null or not on 04 jan 2020
if(retString != null && retString.trim().length() > 0)
{
return retString;//end
}
System.out.println("After POST_ON_LINE retString["+retString+"] RunMode["+gs_run_mode+"]"); //added by monika on 04 jan 2020
confirmed = (String) hdrMap.get("confirmed");
if(!"Y".equals(confirmed))
{
/*sql = "update drcr_rcp set confirmed = 'Y', conf_date = ? ,emp_code__aprv = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, tranDate);
pstmt.setString(2, empCodeAprv);
pstmt.setString(3, (String)hdrMap.get("ref_id"));
*/
//System.out.println("tranId in drcrracp:["+hdrMap.get("tran_id")+" ] conf_date["+tranDate);
sql = "update drcr_rcp set confirmed = 'Y', conf_date = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, tranDate);
pstmt.setString(2, (String)hdrMap.get("tran_id"));
pstmt.executeUpdate();
if(pstmt!=null)
{
pstmt.close();pstmt=null;
}
}
//end
// System.out.println("After POST_ON_LINE retString["+retString+"] RunMode["+gs_run_mode+"]");
if("I".equals(gs_run_mode) && (retString == null || retString.trim().length() == 0)) if("I".equals(gs_run_mode) && (retString == null || retString.trim().length() == 0))
{ {
invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn)); invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn));
System.out.println("INV_IBCA_GEN["+invIbcaGen+"]"); // System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen)) if("NULLFOUND".equals(invIbcaGen))
{ {
...@@ -1567,11 +1704,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1567,11 +1704,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null; rs.close();rs = null;
} }
}//end key string
sql = " select link_type, acct_code__pay, cctr_code__pay, acct_code__rcp, cctr_code__rcp " sql = " select link_type, acct_code__pay, cctr_code__pay, acct_code__rcp, cctr_code__rcp "
+" from ibca_rcp_ctrl where site_code__from = ? and site_code__to = ? "; +" from ibca_rcp_ctrl where site_code__from = ? and site_code__to = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); /* pstmt.setString(1,siteCode);
pstmt.setString(2,siteCodeRcv); pstmt.setString(2,siteCodeRcv);*/
pstmt.setString(1,siteCodeRcv);
pstmt.setString(2,siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -1590,14 +1730,19 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1590,14 +1730,19 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null; rs.close();rs = null;
} }
// System.out.println("key string ["+keyStr+"]");
//ibcaID = generateTranId("w_rcp_ibca", loginSiteCode, currDateStr, conn); //ibcaID = generateTranId("w_rcp_ibca", loginSiteCode, currDateStr, conn);
String xmlValues = ""; String xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>"; xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id/>"; xmlValues = xmlValues + "<tran_id/>";
xmlValues = xmlValues + "<site_code__from>" + siteCode + "</site_code__from>"; /*xmlValues = xmlValues + "<site_code__from>" + siteCode + "</site_code__from>";
xmlValues = xmlValues + "<site_code__to>" + siteCodeRcv + "</site_code__to>"; xmlValues = xmlValues + "<site_code__to>" + siteCodeRcv + "</site_code__to>";
*/
xmlValues = xmlValues + "<site_code__from>" + siteCodeRcv + "</site_code__from>";
xmlValues = xmlValues + "<site_code__to>" + siteCode + "</site_code__to>";
xmlValues = xmlValues + "<tran_date>"+ currDateStr + "</tran_date>"; xmlValues = xmlValues + "<tran_date>"+ currDateStr + "</tran_date>";
xmlValues = xmlValues + "<link_type>"+linkType+"</link_type>"; xmlValues = xmlValues + "<link_type>"+linkType+"</link_type>";
xmlValues = xmlValues + "</Detail1></Root>"; xmlValues = xmlValues + "</Detail1></Root>";
...@@ -1612,18 +1757,32 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1612,18 +1757,32 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
remarks = " Auto IBCA transfer of Dr/Cr Note of " + custCode; remarks = " Auto IBCA transfer of Dr/Cr Note of " + custCode;
sql = " select ref_date, curr_code, exch_rate, cust_code, acct_code, " /*sql = " select ref_date, curr_code, exch_rate, cust_code, acct_code, "
+" cctr_code, due_date, (tot_amt - adj_amt) as amt , discount, tax_amt, auto_rcp, " +" cctr_code, due_date, (tot_amt - adj_amt) as amt , discount, tax_amt, auto_rcp, "
+" bank_code, recd, ref_type, cr_term, item_ser, sales_pers, " +" bank_code, recd, ref_type, cr_term, item_ser, sales_pers, "
+" sales_pers__1, sales_pers__2, tran_date,cust_ref_no,cust_ref_date,cust_ref_amt,gp_no,gp_date " +" sales_pers__1, sales_pers__2, tran_date,cust_ref_no,cust_ref_date,cust_ref_amt,gp_no,gp_date "
+" from receivables where tran_ser like '%RCP%' and ref_no = ? "; +" from receivables where tran_ser like '%RCP%' and ref_no = ? ";*/
/* sql = " select ref_date, curr_code, exch_rate, cust_code, acct_code, "
+" cctr_code, due_date, (tot_amt-adj_amt) as amt , discount, tax_amt, auto_rcp, "
+" bank_code, recd, ref_type, cr_term, item_ser, sales_pers, "
+" sales_pers__1, sales_pers__2, tran_date,cust_ref_no,cust_ref_date,cust_ref_amt,gp_no,gp_date,status,tran_ser "
+" from receivables where tran_ser like 'R-IBC%' and ref_no = ? and (tot_amt-adj_amt<>0)";
*/
sql = " select ref_date, curr_code, exch_rate, cust_code, acct_code, "
+" cctr_code, due_date, (tot_amt-adj_amt) as amt , discount, tax_amt, auto_rcp, "
+" bank_code, recd, ref_type, cr_term, item_ser, sales_pers, "
+" sales_pers__1, sales_pers__2, tran_date,cust_ref_no,cust_ref_date,cust_ref_amt,gp_no,gp_date,status,tran_ser "
+" from receivables where tran_ser IN('DRNRCP','CRNRCP') and ref_no = ? and (tot_amt-adj_amt<>0)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);//commented by monika 24 dec 2019
//pstmt.setString(1,invoiceID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
System.out.println("Inside rs.Next()-----");
//System.out.println("Inside rs.Next()-----");
refDate = rs.getTimestamp("ref_date"); refDate = rs.getTimestamp("ref_date");
currCode = rs.getString("curr_code"); currCode = rs.getString("curr_code");
exchRate = rs.getDouble("exch_rate"); exchRate = rs.getDouble("exch_rate");
...@@ -1649,7 +1808,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1649,7 +1808,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
custRefAmount = rs.getDouble("cust_ref_amt"); custRefAmount = rs.getDouble("cust_ref_amt");
gpNo = rs.getString("gp_no"); gpNo = rs.getString("gp_no");
gpDate = rs.getTimestamp("gp_date"); gpDate = rs.getTimestamp("gp_date");
} statusIBCA=rs.getString("status");
tranSerRcb=rs.getString("tran_ser");
//}//commented by monika 7 jan
//System.out.println("tran_ser in ibca--->"+tranSerRcb+"");
if(pstmt != null) if(pstmt != null)
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
...@@ -1659,22 +1822,30 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1659,22 +1822,30 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null; rs.close();rs = null;
} }
if(amount < 0) if(amount < 0)
{ {
tranSer = "CRNRCP"; tranSer = "DRNRCP";
} }
else else
{ {
tranSer = "CRNRCP"; tranSer = "CRNRCP";
} }
/*if(currCode==null || currCode.trim().length() == 0)
{
currCode=(String) hdrMap.get("curr_code");
System.out.println("amount["+amount+"] * exchRate["+exchRate+"]* "); }*/
//System.out.println("amount["+amount+"] * exchRate["+exchRate+"]* "+" ");
amountBc = amount * exchRate ; amountBc = amount * exchRate ;
System.out.println("amountBc--["+amountBc+"]"); //System.out.println("amountBc--["+amountBc+"]");
if(amountBc != 0) ///if(amountBc != 0)
if(!"A".equalsIgnoreCase(statusIBCA))
{ {
//System.out.println("inside r-ibca insert for rcpibca"+tranSer);
sql = " insert into rcp_ibca (tran_id, tran_date, eff_date, site_code__from, fin_entity__from, " sql = " insert into rcp_ibca (tran_id, tran_date, eff_date, site_code__from, fin_entity__from, "
+" site_code__to, fin_entity__to, amount, curr_code, exch_rate, confirmed, acct_code__ifr," +" site_code__to, fin_entity__to, amount, curr_code, exch_rate, confirmed, acct_code__ifr,"
+" cctr_code__ifr, acct_code__ito, cctr_code__ito, chg_date, chg_user, chg_term, amount__bc, " +" cctr_code__ifr, acct_code__ito, cctr_code__ito, chg_date, chg_user, chg_term, amount__bc, "
...@@ -1705,7 +1876,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1705,7 +1876,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(22, linkType); pstmt.setString(22, linkType);
pstmt.setString(23, remarks); pstmt.setString(23, remarks);
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close();
pstmt = null;
sql = " insert into rcp_ibca_det (tran_id, ref_ser, ref_no, ref_date, curr_code, exch_rate, " sql = " insert into rcp_ibca_det (tran_id, ref_ser, ref_no, ref_date, curr_code, exch_rate, "
+" cust_code, acct_code, cctr_code, due_date, tot_amt, discount,tax_amt, bank_code, " +" cust_code, acct_code, cctr_code, due_date, tot_amt, discount,tax_amt, bank_code, "
+" ref_type, auto_rcp, sales_pers, item_ser, sales_pers__1, sales_pers__2, cr_term, " +" ref_type, auto_rcp, sales_pers, item_ser, sales_pers__1, sales_pers__2, cr_term, "
...@@ -1715,7 +1887,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1715,7 +1887,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(1, ibcaID); pstmt.setString(1, ibcaID);
pstmt.setString(2, refSerHdr); pstmt.setString(2, refSerHdr);
pstmt.setString(3, tranId); pstmt.setString(3, tranId);
pstmt.setTimestamp(4, refDate); pstmt.setTimestamp(4,refDate);
pstmt.setString(5, currCode); pstmt.setString(5, currCode);
pstmt.setDouble(6, exchRate); pstmt.setDouble(6, exchRate);
pstmt.setString(7, custCode); pstmt.setString(7, custCode);
...@@ -1742,22 +1914,27 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1742,22 +1914,27 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(28, gpNo); pstmt.setString(28, gpNo);
pstmt.setTimestamp(29, gpDate); pstmt.setTimestamp(29, gpDate);
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close();pstmt = null;
//ls_errcode = nvo_rcpibca.gbf_retrieve_ribca(ls_ibca_id, ls_ibca_id, 1,ls_site)
//retString = gbf_retrieve_ribca(ibcaID, siteCode, xtraParams, conn);
RcvIbcaConf ibcaObj = new RcvIbcaConf(); RcvIbcaConf ibcaObj = new RcvIbcaConf();
retString = ibcaObj.confirm(ibcaID, xtraParams, "", conn); retString = ibcaObj.confirm(ibcaID, xtraParams, "", conn);
System.out.println("After gbf_retrieve_ribca ----->["+retString+"]"); //System.out.println("After gbf_retrieve_ribca ----->["+retString+"]");
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
{ {
return retString; return retString;
} }
//update in receivblea to adjust amount
}//status close
}//closing rs.next
else {
retString = itmDBAccessEJB.getErrorString("", "VTUNCANCEL", "", "",conn);
return retString;
}//added by monika 7 dec 2019
} }
}
}
} }
} }
} }
...@@ -1821,7 +1998,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1821,7 +1998,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
try try
{ {
System.out.println("Inside gbf_post_drcr_rcphdr...tranId["+tranId+"]"); //System.out.println("Inside gbf_post_drcr_rcphdr...tranId["+tranId+"]"+"connection 11"+conn);
today = new java.sql.Timestamp(System.currentTimeMillis()) ; today = new java.sql.Timestamp(System.currentTimeMillis()) ;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -1857,7 +2034,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1857,7 +2034,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
drcrFalg = (String) hdrMap.get("drcr_flag"); drcrFalg = (String) hdrMap.get("drcr_flag");
System.out.println("DRCR Flag inside gbf_post_drcr_rcphdr["+drcrFalg+"]"); //System.out.println("DRCR Flag inside gbf_post_drcr_rcphdr["+drcrFalg+"]");
if("D".equalsIgnoreCase(drcrFalg)) if("D".equalsIgnoreCase(drcrFalg))
{ {
...@@ -1922,14 +2099,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1922,14 +2099,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
refSer = (String) glTraceMap.get("ref_ser"); refSer = (String) glTraceMap.get("ref_ser");
refNo = (String) glTraceMap.get("ref_id"); refNo = (String) glTraceMap.get("ref_id");
System.out.println("RefSer["+refSer+"] and RefNo["+refNo+"]"); //System.out.println("RefSer["+refSer+"] and RefNo["+refNo+"]");
partyDocPref = finCommon.gfGetPartyDocRef(refSer, refNo, conn); partyDocPref = finCommon.gfGetPartyDocRef(refSer, refNo, conn);
glTraceMap.put("party_doc_ref", partyDocPref); glTraceMap.put("party_doc_ref", partyDocPref);
errString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn); errString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After glTraceUpdate--->["+errString+"]"); //System.out.println("After glTraceUpdate--->["+errString+"]");
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -1979,7 +2156,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1979,7 +2156,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
sundryBalMap.put("contact_code",contactCode ); sundryBalMap.put("contact_code",contactCode );
errString = finCommon.gbf_sundrybal_upd((HashMap) sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd((HashMap) sundryBalMap,conn);
System.out.println("After gbf_sundrybal_upd--->["+errString+"]"); //System.out.println("After gbf_sundrybal_upd--->["+errString+"]");
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -1993,7 +2170,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -1993,7 +2170,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
receivablesMap.put("site_code", hdrMap.get("site_code")); receivablesMap.put("site_code", hdrMap.get("site_code"));
receivablesMap.put("ref_no", (String) hdrMap.get("tran_id")); receivablesMap.put("ref_no", (String) hdrMap.get("tran_id"));
receivablesMap.put("due_date", (Timestamp) hdrMap.get("due_date")); receivablesMap.put("due_date", (Timestamp) hdrMap.get("due_date"));
receivablesMap.put("eff_date", (Timestamp) hdrMap.get("eff_date")); receivablesMap.put("eff_date", (Timestamp) hdrMap.get("tran_date"));
receivablesMap.put("curr_code", hdrMap.get("curr_code")); receivablesMap.put("curr_code", hdrMap.get("curr_code"));
receivablesMap.put("exch_rate", hdrMap.get("exch_rate")); receivablesMap.put("exch_rate", hdrMap.get("exch_rate"));
receivablesMap.put("cust_code", hdrMap.get("cust_code")); receivablesMap.put("cust_code", hdrMap.get("cust_code"));
...@@ -2001,7 +2178,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2001,7 +2178,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
receivablesMap.put("cctr_code", hdrMap.get("cctr_code")); receivablesMap.put("cctr_code", hdrMap.get("cctr_code"));
receivablesMap.put("tax_amt", "0"); receivablesMap.put("tax_amt", "0");
receivablesMap.put("discount", "0"); receivablesMap.put("discount", "0");
receivablesMap.put("ref_date", (Timestamp) hdrMap.get("tran_date"));//ADDED TO SET REF _DATE
if("D".equals(drcrFalg)) if("D".equals(drcrFalg))
{ {
receivablesMap.put("tot_amt", (Double) hdrMap.get("amount")); receivablesMap.put("tot_amt", (Double) hdrMap.get("amount"));
...@@ -2063,15 +2240,15 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2063,15 +2240,15 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
receivablesMap.put("mrp_value", (double) mrpValue); receivablesMap.put("mrp_value", (double) mrpValue);
errString = finCommon.gbfReceivablesUpd((HashMap) receivablesMap,conn); errString = finCommon.gbfReceivablesUpd((HashMap) receivablesMap,conn);
System.out.println("After gbfReceivablesUpd--->["+errString+"]"); //System.out.println("After gbfReceivablesUpd--->["+errString+"]");
//System.out.println("receivables map enrty-->["+receivablesMap+"]");
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
confirmed = (String) hdrMap.get("confirmed"); confirmed = (String) hdrMap.get("confirmed");
if(!"Y".equals(confirmed)) /*if(!"Y".equals(confirmed))
{ {
sql = "update drcr_rcp set confirmed = 'Y', conf_date = ? ,emp_code__aprv = ? where tran_id = ? "; sql = "update drcr_rcp set confirmed = 'Y', conf_date = ? ,emp_code__aprv = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2084,7 +2261,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2084,7 +2261,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.close();pstmt=null; pstmt.close();pstmt=null;
} }
} }
*///commented by monika jan 04 2020
tranSer = (String) hdrMap.get("tran_ser"); tranSer = (String) hdrMap.get("tran_ser");
if("CRNRCP".equals(tranSer)) if("CRNRCP".equals(tranSer))
...@@ -2124,7 +2301,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2124,7 +2301,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
CreateRCPXML createRCPXML = new CreateRCPXML(winName, "tran_id"); CreateRCPXML createRCPXML = new CreateRCPXML(winName, "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn); dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]"); //System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr); Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb(); E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
...@@ -2132,7 +2309,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2132,7 +2309,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
createRCPXML = null; createRCPXML = null;
e12CreateBatchLoad = null; e12CreateBatchLoad = null;
System.out.println("retString from edi 2 batchload gbf_post_drcr_rcphdr--->[" + errString + "]"); //System.out.println("retString from edi 2 batchload gbf_post_drcr_rcphdr--->[" + errString + "]");
//if (errString != null && "SUCCESS".equalsIgnoreCase(errString)) //if (errString != null && "SUCCESS".equalsIgnoreCase(errString))
if (errString != null && errString.indexOf("SUCCESS") != -1) if (errString != null && errString.indexOf("SUCCESS") != -1)
...@@ -2200,7 +2377,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2200,7 +2377,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
try try
{ {
System.out.println("Inside gbf_post_drcr_rcpdet detailList size-->"+detailList.size()); //System.out.println("Inside gbf_post_drcr_rcpdet detailList size-->"+detailList.size()+" connection 6"+conn);
drcrFalg = (String)hdrMap.get("drcr_flag"); drcrFalg = (String)hdrMap.get("drcr_flag");
tranDate = (Timestamp)hdrMap.get("tran_date"); tranDate = (Timestamp)hdrMap.get("tran_date");
...@@ -2216,7 +2393,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2216,7 +2393,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
for (int ctr =0; ctr < detailList.size(); ctr++) for (int ctr =0; ctr < detailList.size(); ctr++)
{ {
detMap = (HashMap) detailList.get(ctr); detMap = (HashMap) detailList.get(ctr);
System.out.println(" DetMap ctr [" + ctr + "] ["+detMap + "]"); //System.out.println(" DetMap ctr [" + ctr + "] ["+detMap + "]");
itemCode = checkNull((String)detMap.get("item_code")); itemCode = checkNull((String)detMap.get("item_code"));
tranSer = (String)hdrMap.get("tran_ser"); tranSer = (String)hdrMap.get("tran_ser");
...@@ -2261,6 +2438,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2261,6 +2438,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
glTraceMap.put("anal_code", (String)detMap.get("anal_code")); glTraceMap.put("anal_code", (String)detMap.get("anal_code"));
glTraceMap.put("curr_code", (String)hdrMap.get("curr_code")); glTraceMap.put("curr_code", (String)hdrMap.get("curr_code"));
glTraceMap.put("exch_rate", (Double)hdrMap.get("exch_rate")); glTraceMap.put("exch_rate", (Double)hdrMap.get("exch_rate"));
//System.out.println("DRCR FLAG111"+drcrFalg+"]");
if("D".equals(drcrFalg)) if("D".equals(drcrFalg))
{ {
...@@ -2294,14 +2472,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2294,14 +2472,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
glTraceMap.put("ref_ser", tranSer); glTraceMap.put("ref_ser", tranSer);
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
System.out.println("refSer["+tranSer+"] tranId["+tranId+"]"); //System.out.println("refSer["+tranSer+"] tranId["+tranId+"]");
partyDocPref = finCommon.gfGetPartyDocRef(tranSer, tranId, conn); partyDocPref = finCommon.gfGetPartyDocRef(tranSer, tranId, conn);
glTraceMap.put("party_doc_ref", partyDocPref); glTraceMap.put("party_doc_ref", partyDocPref);
errString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn); errString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After glTraceUpdate---->["+errString+"]"); //System.out.println("After glTraceUpdate---->["+errString+"]");
//System.out.println("DETAIL GLTRACE--["+glTraceMap+"]");
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -2346,13 +2524,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2346,13 +2524,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
ResultSet rs = null; ResultSet rs = null;
Map detMap = null; Map detMap = null;
String refSer = "",refNo = "", refSerHdr = ""; String refSer = "",refNo = "", refSerHdr = "",status="";
double totAdjAmount = 0,amount = 0,adjAmt = 0,totalAmount = 0; double totAdjAmount = 0,amount = 0,adjAmt = 0,totalAmount = 0,amounthdr=0,totalAmountCRN=0;
try try
{ {
System.out.println("Inside gbf_post_drcr_adjdet detailList size-->"+detailList.size()); //System.out.println(" "+detailList.size());
tranId = (String)hdrMap.get("tran_id"); tranId = (String)hdrMap.get("tran_id");
refSerHdr = (String)hdrMap.get("tran_ser"); refSerHdr = (String)hdrMap.get("tran_ser");
...@@ -2364,11 +2542,63 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2364,11 +2542,63 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
refSer = checkNull((String)detMap.get("ref_ser")); refSer = checkNull((String)detMap.get("ref_ser"));
refNo = (String)detMap.get("ref_no"); refNo = (String)detMap.get("ref_no");
amount = (Double) detMap.get("adj_amt"); amount = (Double) detMap.get("adj_amt");
totAdjAmount += amount; amounthdr=(Double) hdrMap.get("amount");//added by monika to get data from hdr
sql = "update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + ? ) where tran_ser = ? and ref_no = ? "; // totAdjAmount += amount;//commented by monika 19 dec 2019
//System.out.println("@@@1@@@update r-ibca1 "+amounthdr+"total adj "+totAdjAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
sql = " select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount); pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
if(rs.next())
{
adjAmt = rs.getDouble("adj_amt");
totalAmount = rs.getDouble("tot_amt");
}
if(rs!=null)
{
rs.close();rs = null;
}
if(pstmt!=null)
{
pstmt.close();pstmt = null;
}
//System.out.println("@@@1@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
//added by monika to update status an adjamt in single query
totAdjAmount = adjAmt+amounthdr;
//System.out.println("@@@2@@@@{totAdjAmount"+totAdjAmount+" ");
if((totalAmount-totAdjAmount)==0)
{
status = "A";
}
else
{
status = "P";
}
sql="update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + ? ),status=? where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
// pstmt.setDouble(1,amount);//commented byb monika 19 dec 2019
pstmt.setDouble(1,totAdjAmount);//added to adjust amount in receivables 19 dec 2019
pstmt.setString(2,status);
pstmt.setString(3,refSer);
pstmt.setString(4,refNo);
pstmt.executeUpdate();
//System.out.println("@@@2@@@@ IF...");
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
/*
* sql = "update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + ? ) where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
// pstmt.setDouble(1,amount);//commented byb monika 19 dec 2019
pstmt.setDouble(1,totAdjAmount);//added to adjust amount in receivables 19 dec 2019
pstmt.setString(2,refSer); pstmt.setString(2,refSer);
pstmt.setString(3,refNo); pstmt.setString(3,refNo);
pstmt.executeUpdate(); pstmt.executeUpdate();
...@@ -2377,6 +2607,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2377,6 +2607,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
System.out.println("@@@2@@@@{"+sql);
sql = " select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? "; sql = " select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2397,8 +2628,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2397,8 +2628,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
System.out.println("@@@1@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
if(adjAmt > totalAmount) // if(adjAmt >= totalAmount)
if(adjAmt >= totalAmount)
{ {
sql = "update receivables set status = ? where tran_ser = ? and ref_no = ?"; sql = "update receivables set status = ? where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2412,19 +2645,75 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2412,19 +2645,75 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
} }
*
*///commenetd by monika 20 dec 19 to set status and adj in one query
sql = "select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
sql = " update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + (-1 * ?) ) where tran_ser = ? and ref_no = ? "; if(rs.next())
{
adjAmt = rs.getDouble("adj_amt");
totalAmount = rs.getDouble("tot_amt");
}
if(rs!=null)
{
rs.close();rs = null;
}
if(pstmt!=null)
{
pstmt.close();pstmt = null;
}
//System.out.println("@@@1@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
//ADDED BY MONIKA 20 DEC 19
//totalAmountCRN=adjAmt+amounthdr;
//System.out.println("@@@4@@@update crdrrcp "+totalAmountCRN);
if((totalAmount-adjAmt)==0)
{
status = "A";
}
else
{
status = "P";
}
//System.out.println("@@@4@@@update crdrrcp IF ");
sql = " update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + (-1 * ?) ),status=? where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount); //pstmt.setDouble(1,amount);//commented by monika 19 dec 2019
pstmt.setString(2,refSerHdr); pstmt.setDouble(1,adjAmt);////added to adjust amount in receivables 19 dec 2019
pstmt.setString(3,tranId); pstmt.setString(2,status);
pstmt.setString(3,refSerHdr);
pstmt.setString(4,tranId);
pstmt.executeUpdate();
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
// if(adjAmt >= totalAmount)
/*if(adjAmt >= totalAmount)
{
sql = "update receivables set status = ? where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"A");
pstmt.setString(2,refSer);
pstmt.setString(3,refNo);
pstmt.executeUpdate(); pstmt.executeUpdate();
if(pstmt!=null) if(pstmt!=null)
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
}*/
//System.out.println("@@@2@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
//System.out.println("@@@3@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
/*
sql = " select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? "; sql = " select adj_amt, tot_amt from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSerHdr); pstmt.setString(1,refSerHdr);
...@@ -2444,8 +2733,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2444,8 +2733,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
System.out.println("@@@4@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
*/
////System.out.println("@@@4@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
if(adjAmt == totalAmount) /*if(adjAmt == totalAmount)
{ {
sql = "update receivables set status = ? where tran_ser = ? and ref_no = ?"; sql = "update receivables set status = ? where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2458,8 +2750,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2458,8 +2750,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
}*/
} }
} //System.out.println("@@@5@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -2508,7 +2801,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2508,7 +2801,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
try try
{ {
System.out.println("Inside gbf_invoice_drcr_adj...tranIDDrCr["+tranIDDrCr+"]"); //System.out.println("Inside gbf_invoice_drcr_adj...tranIDDrCr["+tranIDDrCr+"] connection66 "+conn);
currDate = new java.sql.Timestamp(System.currentTimeMillis()); currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
...@@ -2577,6 +2870,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2577,6 +2870,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
else if("CRNRCP".equals(tranSer) && "D".equals(adjRecv)) else if("CRNRCP".equals(tranSer) && "D".equals(adjRecv))
{ {
//System.out.println("inside crnrcp");
sql = " update drcr_rcp set adj_recv = 'N' where tran_id = ? "; sql = " update drcr_rcp set adj_recv = 'N' where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIDDrCr); pstmt.setString(1, tranIDDrCr);
...@@ -2715,8 +3010,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2715,8 +3010,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
rs.close();rs = null; rs.close();rs = null;
} }
diffAmount = totAmount - adjAmount;
//System.out.println("differenceAMt in drcr11"+totAmount+" totAmount" +adjAmount);
diffAmount = totAmount - adjAmount;
//System.out.println("differenceAMt in drcr"+diffAmount);
sql = " select invoice_id, sum(net_amt) as net_amt from drcr_rdet where tran_id = ? group by invoice_id "; sql = " select invoice_id, sum(net_amt) as net_amt from drcr_rdet where tran_id = ? group by invoice_id ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIDDrCr); pstmt.setString(1, tranIDDrCr);
...@@ -2744,6 +3041,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2744,6 +3041,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
invoiceID = (String) invoiceIDList.get(i); invoiceID = (String) invoiceIDList.get(i);
adjRefNo = invoiceID; adjRefNo = invoiceID;
diffAmount = (Double) netAmountList.get(i); diffAmount = (Double) netAmountList.get(i);
//System.out.println("@@@6@@@update diiferenceamount "+diffAmount+"total adj "+tranSer);
if("CRNRCP".equals(tranSer) || "R-ADV".equals(tranSer)) if("CRNRCP".equals(tranSer) || "R-ADV".equals(tranSer))
{ {
...@@ -2761,7 +3059,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2761,7 +3059,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
System.out.println("Inside receivables for refNo ["+invoiceID+"] "); //System.out.println("Inside receivables for refNo ["+invoiceID+"] ");
invTot = rs.getDouble("tot_amt"); invTot = rs.getDouble("tot_amt");
invAdj = rs.getDouble("adj_amt"); invAdj = rs.getDouble("adj_amt");
...@@ -2802,9 +3100,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2802,9 +3100,13 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
nextID = generateTranId( "w_rec_adj", siteCode, currDateStr, conn); nextID = generateTranId( "w_rec_adj", siteCode, currDateStr, conn);
//System.out.println("receivables_adj"+sql);
/* sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values(?, ?, ?, ?, ?, ?, ?, ?, ?) ";
*/
sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) " sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values(?, ?, ?, ?, ?, ?, ?, ?, ?) "; + " values(?, ?, ?, ?, ?, ?, ?, ?, ?) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, nextID); pstmt.setString(1, nextID);
pstmt.setString(2, tranSer); pstmt.setString(2, tranSer);
...@@ -2815,13 +3117,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2815,13 +3117,14 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(7, adjTranSer); pstmt.setString(7, adjTranSer);
pstmt.setString(8, adjRefNo); pstmt.setString(8, adjRefNo);
pstmt.setString(9, tranID); pstmt.setString(9, tranID);
pstmt.executeUpdate(); pstmt.executeUpdate();
if(pstmt!=null) if(pstmt!=null)
{ {
pstmt.close();pstmt= null; pstmt.close();pstmt= null;
} }
//System.out.println("receivables_adj1111"+sql);
if(i == 0) if(i == 0)
{ {
sql = " update receivables set adj_amt = tot_amt, status = 'A' where tran_id = ? "; sql = " update receivables set adj_amt = tot_amt, status = 'A' where tran_id = ? ";
...@@ -2856,9 +3159,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2856,9 +3159,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pendAmount = invTot - invAdj; pendAmount = invTot - invAdj;
crAmount = diffAmount; crAmount = diffAmount;
diffAmount = diffAmount + pendAmount; diffAmount = diffAmount + pendAmount;
//System.out.println("diffAmount"+diffAmount+"tranSer---"+tranSer);
if(diffAmount <= 0) if(diffAmount <= 0)
{ {
//System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+pendAmount+"transer--"+adjTranSer);
status = "A"; status = "A";
sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? "; sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -2874,7 +3179,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2874,7 +3179,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
} }
} }
else else
{ { //System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+crAmount+"transer--"+adjTranSer);
status = "U"; status = "U";
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? "; sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -2889,6 +3195,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2889,6 +3195,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
} }
//System.out.println("inside diiamount crnrcp33332"+diffAmount+"adjamount--"+crAmount+"transer--"+adjTranSer);
} }
else if("DRNRCP".equals(tranSer) || "MDRCRD".equals(tranSer)) else if("DRNRCP".equals(tranSer) || "MDRCRD".equals(tranSer))
...@@ -2901,6 +3208,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2901,6 +3208,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{ {
status = "A"; status = "A";
} }
//System.out.println("inside diiamount crnrcp222222 status "+status+"adjamount--"+crAmount+"transer--"+adjTranSer);
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? "; sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -2972,7 +3280,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2972,7 +3280,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
java.sql.Date effDate = null; java.sql.Date effDate = null;
try try
{ {
System.out.println("generateTranId() called"); //System.out.println("generateTranId() called conn88"+conn);
selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? "; selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
// System.out.println("selSql :"+selSql); // System.out.println("selSql :"+selSql);
pstmt = conn.prepareStatement(selSql); pstmt = conn.prepareStatement(selSql);
...@@ -2988,9 +3296,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2988,9 +3296,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("keyString :" + keyString); //System.out.println("keyString :" + keyString);
System.out.println("keyCol :" + keyCol); //System.out.println("keyCol :" + keyCol);
System.out.println("tranSer :" + tranSer); //System.out.println("tranSer :" + tranSer);
xmlValues = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; xmlValues = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>"; xmlValues = xmlValues + "<Detail1>";
...@@ -2998,7 +3306,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr ...@@ -2998,7 +3306,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>"; xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>"; xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>"; xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :[" + xmlValues + "]"); //System.out.println("xmlValues :[" + xmlValues + "]");
TransIDGenerator generatedTranid = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME); TransIDGenerator generatedTranid = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranId = generatedTranid.generateTranSeqID(tranSer, keyCol, keyString, conn); tranId = generatedTranid.generateTranSeqID(tranSer, keyCol, keyString, conn);
......
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