Skip to content

B
business-java
Commit 4ef5964a authored by ngadkari's avatar ngadkari
Browse files
Options

Changes for Charge Back new replacement module 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209409 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0b2b9b92
Hide whitespace changes
Inline Side-by-side
Showing with 587 additions and 414 deletions
webitm-dis/src/ibase/webitm/ejb/dis/ChrgBckLocConf.java
View file @ 4ef5964a
......@@ -48,6 +48,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
String loginSite = "";
String implMinRateHistory="";
FinCommon finCommon = new FinCommon();
PostOrderProcess postPrc= new PostOrderProcess();
/* public void ejbCreate() throws RemoteException, CreateException
{
System.out.println("Create Method Called....");
......@@ -89,6 +90,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
ResultSet rltSet = null;
int cnt = 0;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
ConnDriver connDriver = new ConnDriver();
......@@ -128,20 +130,25 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
Document dom = null ;
String generatedId="";
String retString="";
boolean isError=false;
boolean isError=false,failValue=false ,failQty=false;
Set mapSet=null;
Iterator mapIterator=null;
Map.Entry mapEntry=null;
String keyString="";
String valueString="";
ArrayList<String> valueStringList=new ArrayList<String>();
int countError = 0;
int countError = 0,count=0,updCnt=0;
String chargeBakSql = "", secondarySchSql = "", schemeBalSql = "",drcrRcpSql="",customerSql="",customerSql1="",validUpto="";
String custCode1 = "", itemCodeRepl = "", confDateStr = "", settleMethod = "", siteCode1 = "",custCode2="",siteCode2="",
offer = "", vaildUpto = "";
int freeQty = 0, freeVaule = 0;
offer = "", vaildUpto = "",itemSer="";
double freeQty = 0, freeVaule = 0; // chnage int to double by nandkumar gadkari on 1/10/19
Map map1=new HashMap();
Map map2=new HashMap();
// added by nandkumar gadkari on 1/10/19
PreparedStatement preparedStatement = null, preparedStatement1 = null;
ResultSet resultSet = null;
String schItemCodeRepl="",itemCode="",tranId="",schItemCode="",custCodeCredit="";
double schFreeValue=0,freeValue=0,schQty=0,schFreeQty=0;
try
{
//Changes and Commented By Bhushan on 09-06-2016 :START
......@@ -161,15 +168,16 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
implMinRateHistory="N";
}
System.out.println("implMinRateHistory["+implMinRateHistory+"]");
// item_ser and settle_mth added by nandkumar gadkari on 01/10/19
if("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) // conditions is added by sagar on 13/07/15
{
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt "
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt,item_ser,cust_code__credit,settle_mth "
+ " from charge_back where tran_id = ? for update ";
}
else if("mssql".equalsIgnoreCase(CommonConstants.DB_NAME))
{
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt "
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt,item_ser,cust_code__credit,settle_mth "
+ " from charge_back (updlock) where tran_id = ? ";
}
......@@ -179,7 +187,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
/*sql = " select tran_id, tran_date, site_code, cust_code, confirmed "
+ " from charge_back where tran_id = ? for update nowait ";*/
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt "
sql = " select tran_id, tran_date, site_code, cust_code, confirmed,net_amt,item_ser,cust_code__credit,settle_mth "
+ " from charge_back where tran_id = ? for update nowait ";
}
System.out.println(">>>>ChrgBckLocConf sql:"+ sql);
......@@ -193,6 +201,9 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
custCode = rs.getString("cust_code");
confirmed = rs.getString("confirmed");
netAmt = rs.getDouble("net_amt"); //ADDED FOR AMOUNT COMPARISION FOR CREATION OF CR OR DR NOTE
itemSer= rs.getString("item_ser"); // item_ser added by nandkumar gadkari on 01/10/19
custCodeCredit= rs.getString("cust_code__credit"); // custCodeCredit added by nandkumar gadkari on 01/10/19
settleMethod = rs.getString("Settle_Mth"); // custCodeCredit added by nandkumar gadkari on 01/10/19
}
rs.close();
rs = null;
......@@ -238,7 +249,163 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
System.out.println(">>>>>>>Now sysDateStr :=> " + sysDateStr +"netAmt>>>"+netAmt);
sysDate= Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println(">>>>>>>>sysDate:"+sysDate);
// added by nandkumar gadkari on 01/10/19--------------------start------------------
if ("V".equalsIgnoreCase(settleMethod) || "Q".equalsIgnoreCase(settleMethod))
{
secondarySchSql = "SELECT ITEM_CODE__REPL,FREE_QTY,FREE_VALUE,OFFER ,ITEM_CODE,FREE_VALUE FROM CHARGE_BACK_REPL WHERE TRAN_ID=?";
preparedStatement1 = conn.prepareStatement(secondarySchSql);
preparedStatement1.setString(1, tranID);
rs = preparedStatement1.executeQuery();
while (rs.next())
{
itemCodeRepl = (E12GenericUtility.checkNull(rs.getString("ITEM_CODE__REPL"))).trim();
freeQty = rs.getDouble("FREE_QTY");
freeVaule = rs.getDouble("FREE_VALUE");
offer = E12GenericUtility.checkNull(rs.getString("OFFER"));
if (offer.length() <= 0)
{
offer = "DEFAULT";
}
if (settleMethod.equalsIgnoreCase("V"))
{
itemCodeRepl = "X";
}
failQty=false;
failValue=false;
itemCode = (E12GenericUtility.checkNull(rs.getString("ITEM_CODE"))).trim();
freeValue = (rs.getDouble("FREE_VALUE"));
sql = "select tran_id from scheme_apprv where aprv_status='A' and scheme_code=? ";
preparedStatement = conn.prepareStatement(sql);
preparedStatement.setString(1,offer);
resultSet = preparedStatement.executeQuery();
if(resultSet.next())
{
tranId = resultSet.getString("tran_id");
}
resultSet.close();
resultSet = null;
preparedStatement.close();
preparedStatement = null;
sql = "SELECT ITEM_CODE,ITEM_CODE__REPL,QUANTITY,FREE_QTY,AMOUNT FROM SCHEME_APPRV_DET WHERE TRAN_ID = ? ";
if(!"V".equalsIgnoreCase(settleMethod))
{
sql =sql + " AND ITEM_CODE= ? ";
}
preparedStatement = conn.prepareStatement(sql);
preparedStatement.setString(1,tranId);
if(!"V".equalsIgnoreCase(settleMethod))
{
preparedStatement.setString(2,itemCode);
}
resultSet = preparedStatement.executeQuery();
if(resultSet.next())
{
countError = 0;
schItemCode= (E12GenericUtility.checkNull(resultSet.getString(1))).trim();
schItemCodeRepl = (E12GenericUtility.checkNull(resultSet.getString(2))).trim();
schQty = resultSet.getDouble(3);
schFreeQty = resultSet.getDouble(4);
schFreeValue = resultSet.getDouble(5);
if("Q".equalsIgnoreCase(settleMethod) && (!schItemCodeRepl.equalsIgnoreCase(itemCodeRepl) || schFreeQty !=freeQty ) )
{
failQty=true;
}
if("V".equalsIgnoreCase(settleMethod) && schFreeValue !=freeVaule )
{
failValue=true;
}
if(failValue || failQty )
{
sql = "select COUNT(1) from BUSINESS_LOGIC_CHECK where SALE_ORDER = ? and TRAN_TYPE = ? and APRV_STAT = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
pstmt.setString(2, "C");
pstmt.setString(3, "O");
rltSet = pstmt.executeQuery();
if(rltSet.next())
{
count=rltSet.getInt(1);
}
rltSet.close();
rltSet=null;
pstmt.close();
pstmt=null;
if(count <= 0)
{
ArrayList BusinessLogicCheckList= new ArrayList();
BusinessLogicCheckList.add(" "+"\t"+" "+"\t"+tranID+"\t"+"1"+"\t"+" "+"\t"+" "+"\t"+custCodeCredit+"\t"+custCode+"\t"+siteCode+"\t"+itemSer+"\t"+sysDateStr);
if(BusinessLogicCheckList.size() > 0)
{
conn.rollback();
countError = postPrc.writeBusinessLogicCheck(BusinessLogicCheckList, siteCode, "C", conn);
if(countError > 0)
{
conn.commit();
}
returnString = itmDBAccessEJB.getErrorString("", "VTWBLGCCHK", "","",conn);
return returnString;
}
}
else
{
if(failQty )
{
sql = "UPDATE SCHEME_APPRV_DET SET ITEM_CODE__REPL =? , FREE_QTY = ? WHERE TRAN_ID = ? AND ITEM_CODE= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCodeRepl);
pstmt.setDouble(2, freeQty);
pstmt.setString(3, tranID);
pstmt.setString(4, itemCode);
updCnt=pstmt.executeUpdate();
pstmt.close();
pstmt=null;
}
if(failValue)
{
sql = "UPDATE SCHEME_APPRV_DET SET AMOUNT = ? WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, freeVaule);
pstmt.setString(2, tranID);
updCnt=pstmt.executeUpdate();
pstmt.close();
pstmt=null;
}
}
}
}
resultSet.close();
resultSet = null;
preparedStatement.close();
preparedStatement = null;
}
if(rs != null)
rs.close();
rs = null;
preparedStatement1.close();
preparedStatement1 = null;
}
// added by nandkumar gadkari on 01/10/19--------------------end------------------
sql = "update charge_back set "
+" confirmed = 'Y', "
+" VERIFY_FLAG = 'Y', "
......@@ -274,148 +441,107 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
// end 02/07/13 manoharan time value to be removed
if( chkupdt > 0) // condition is added by sagar on 13/07/15
{
//Added by Tajuddin Mahadi on 10-OCT-2017-START
double detNetAmt = 0, detInvNetAmt = 0;
String detInvId = "";
/*sql = "select sum(net_amt) as net_amt from charge_back_det where invoice_id is null and tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
if(rs.next()) {
detNetAmt = rs.getDouble("net_amt");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;*/
//Added by Tajuddin Mahadi on 10-OCT-2017-END
//if(netAmt > 0)
/*Commented by manoj dtd 13/11/2017 to create Misc DR/CR amt based on detail amount
if(detNetAmt > 0)
if ("C".equalsIgnoreCase(settleMethod)) // added by nandkumar gadkari on 01/10/19 for creditnote only
{
returnString = createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRCxmlList.add(returnString);
}
else if(detNetAmt < 0) // Added for Debit note generation if amt < 0: Start
{
returnString = createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRDxmlList.add(returnString);
}*/
//MDRCxmlMap = createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRCxmlMap.putAll(createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn ));
/*if(returnString.trim().length()>0)
{
MDRCxmlList.add(returnString);
}*/
//MDRDxmlMap = createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRDxmlMap.putAll(createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn ));
/*if(returnString.trim().length()>0)
{
MDRDxmlList.add(returnString);
}*/
// Added for Debit note generation if amt < 0 :End
sql = "select invoice_id, sum(net_amt) as net_amt from charge_back_det where invoice_id is not null and tran_id = ? and net_amt > 0 "
+ " group by invoice_id";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
while(rs.next())
{
detInvId = rs.getString("invoice_id");
//CRNxmlMap = createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
CRNxmlMap.putAll(createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn));
/*returnString = createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
CRNxmlList.add(returnString);Commented by santosh*/
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
detInvId="";
sql = "select invoice_id, sum(net_amt) as net_amt from charge_back_det where invoice_id is not null and tran_id = ? and net_amt < 0 "
+ " group by invoice_id";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
while(rs.next())
{
detInvId = rs.getString("invoice_id");
//DRNxmlMap = createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
DRNxmlMap.putAll(createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn));
/*returnString = createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
DRNxmlList.add(returnString); Commented by santosh on 23/NOV/2017 */
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("MDRCxmlMap.size()["+MDRCxmlMap.size()+"]");
System.out.println("MDRDxmlMap.size()["+MDRDxmlMap.size()+"]");
System.out.println("CRNxmlMap.size()["+CRNxmlMap.size()+"]");
System.out.println("DRNxmlMap.size()["+DRNxmlMap.size()+"]");
if(MDRCxmlMap.size()>0)
{
mapSet = (Set) MDRCxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@MDRCxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
//Added by Tajuddin Mahadi on 10-OCT-2017-START
double detNetAmt = 0, detInvNetAmt = 0;
String detInvId = "";
/*sql = "select sum(net_amt) as net_amt from charge_back_det where invoice_id is null and tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
if(rs.next()) {
detNetAmt = rs.getDouble("net_amt");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;*/
//Added by Tajuddin Mahadi on 10-OCT-2017-END
//if(netAmt > 0)
/*Commented by manoj dtd 13/11/2017 to create Misc DR/CR amt based on detail amount
if(detNetAmt > 0)
{
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
returnString = createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRCxmlList.add(returnString);
}
else
else if(detNetAmt < 0) // Added for Debit note generation if amt < 0: Start
{
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError= 0;
countError= updateIdinCB(generatedId,tranID,valueStringList,"M",conn);
//if(countError == 0)
if(countError < valueStringList.size())
{
System.out.println("@S@ inside misc credit ["+countError+"]");
isError=true;
}
MDRCIdList.add(generatedId);
returnString = createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRDxmlList.add(returnString);
}*/
//MDRCxmlMap = createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRCxmlMap.putAll(createMiscCrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn ));
/*if(returnString.trim().length()>0)
{
MDRCxmlList.add(returnString);
}*/
//MDRDxmlMap = createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn );
MDRDxmlMap.putAll(createMiscDrnoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, autoConfirm, xtraParams, conn ));
/*if(returnString.trim().length()>0)
{
MDRDxmlList.add(returnString);
}*/
// Added for Debit note generation if amt < 0 :End
sql = "select invoice_id, sum(net_amt) as net_amt from charge_back_det where invoice_id is not null and tran_id = ? and net_amt > 0 "
+ " group by invoice_id";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
while(rs.next())
{
detInvId = rs.getString("invoice_id");
//CRNxmlMap = createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
CRNxmlMap.putAll(createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn));
/*returnString = createCrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
CRNxmlList.add(returnString);Commented by santosh*/
}
}
}
if(!isError)
{
if(MDRDxmlMap.size()>0)
rs.close();
rs=null;
pstmt.close();
pstmt=null;
detInvId="";
sql = "select invoice_id, sum(net_amt) as net_amt from charge_back_det where invoice_id is not null and tran_id = ? and net_amt < 0 "
+ " group by invoice_id";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
while(rs.next())
{
mapSet = (Set) MDRDxmlMap.entrySet();
detInvId = rs.getString("invoice_id");
//DRNxmlMap = createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
DRNxmlMap.putAll(createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn));
/*returnString = createDrNoteCback(currDate, "", siteCode, tranID, tranID, tranDate, tranDate, custCode, custCode, detInvId, autoConfirm, xtraParams, conn);
DRNxmlList.add(returnString); Commented by santosh on 23/NOV/2017 */
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("MDRCxmlMap.size()["+MDRCxmlMap.size()+"]");
System.out.println("MDRDxmlMap.size()["+MDRDxmlMap.size()+"]");
System.out.println("CRNxmlMap.size()["+CRNxmlMap.size()+"]");
System.out.println("DRNxmlMap.size()["+DRNxmlMap.size()+"]");
if(MDRCxmlMap.size()>0)
{
mapSet = (Set) MDRCxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
{
......@@ -426,7 +552,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@MDRDxmlMapreturnString["+returnString+"]");
System.out.println("@S@MDRCxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
{
System.out.println("@@@@@@1: Failed"+returnString);
......@@ -441,134 +567,41 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError = 0;
countError = updateIdinCB(generatedId,tranID,valueStringList,"M",conn);
countError= 0;
countError= updateIdinCB(generatedId,tranID,valueStringList,"M",conn);
//if(countError == 0)
if(countError < valueStringList.size())
{
System.out.println("@S@ inside misc debit ["+countError+"]");
System.out.println("@S@ inside misc credit ["+countError+"]");
isError=true;
}
MDRDIdList.add(generatedId);
MDRCIdList.add(generatedId);
}
}
}
}
//Commented by santosh on 23/NOV/2017
//if(!isError)
// {
// for(int ctr=0;ctr<MDRDxmlList.size();ctr++)
// {
//
// returnString = saveData(siteCode,MDRDxmlList.get(ctr),xtraParams,conn);
// if (returnString.indexOf("Success") < -1)
// {
// System.out.println("@@@@@@1: Failed"+returnString);
// isError=true;
// break;
// }
// else
// {
// System.out.println("@@@@@@2: Success"+returnString);
// isError=false;
// dom = genericUtility.parseString(returnString);
// System.out.println("dom>>>"+dom);
// generatedId = genericUtility.getColumnValue("TranID",dom);
// MDRDIdList.add(generatedId);
//
// /*if( "Y".equalsIgnoreCase( autoConfirm ) )
// {
// dom = genericUtility.parseString(returnString);
// System.out.println("dom>>>"+dom);
// generatedId = genericUtility.getColumnValue("TranID",dom);
// MDRDIdList.add(generatedId);
// //retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
// //retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
// retString = executeSystemEvent("misc_drcr_rcp_dr", "pre_confirm", generatedId, xtraParams, conn);
// System.out.println("retString ::: " + retString);
// if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
// {
// isError=false;
// }
// else
// {
// isError=true;
// break;
// }
//
// }*/
// }
// }
// }
/*if(!isError)
{
for(int ctr=0;ctr<CRNxmlList.size();ctr++)
{
returnString = saveData(siteCode,CRNxmlList.get(ctr),xtraParams,conn);
if (returnString.indexOf("Success") < -1)
{
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
CRNIdList.add(generatedId);
if( "Y".equalsIgnoreCase( autoConfirm ) )
{
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
CRNIdList.add(generatedId);
//retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
//retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
retString = executeSystemEvent("drcrrcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
}
else
{
isError=true;
break;
}
}
}
}
}
*/
if(!isError)
{
if(CRNxmlMap.size()>0)
if(!isError)
{
mapSet = (Set) CRNxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
if(MDRDxmlMap.size()>0)
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@CRNxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
mapSet = (Set) MDRDxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@MDRDxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
{
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
......@@ -578,40 +611,76 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError = 0;
countError = updateIdinCB(generatedId,tranID,valueStringList,"I",conn);
countError = updateIdinCB(generatedId,tranID,valueStringList,"M",conn);
//if(countError == 0)
if(countError < valueStringList.size())
{
System.out.println("@S@ inside credit ["+countError+"]");
System.out.println("@S@ inside misc debit ["+countError+"]");
isError=true;
}
CRNIdList.add(generatedId);
MDRDIdList.add(generatedId);
}
}
}
}
}
}
if(!isError)
{
if(DRNxmlMap.size()>0)
//Commented by santosh on 23/NOV/2017
//if(!isError)
// {
// for(int ctr=0;ctr<MDRDxmlList.size();ctr++)
// {
//
// returnString = saveData(siteCode,MDRDxmlList.get(ctr),xtraParams,conn);
// if (returnString.indexOf("Success") < -1)
// {
// System.out.println("@@@@@@1: Failed"+returnString);
// isError=true;
// break;
// }
// else
// {
// System.out.println("@@@@@@2: Success"+returnString);
// isError=false;
// dom = genericUtility.parseString(returnString);
// System.out.println("dom>>>"+dom);
// generatedId = genericUtility.getColumnValue("TranID",dom);
// MDRDIdList.add(generatedId);
//
// /*if( "Y".equalsIgnoreCase( autoConfirm ) )
// {
// dom = genericUtility.parseString(returnString);
// System.out.println("dom>>>"+dom);
// generatedId = genericUtility.getColumnValue("TranID",dom);
// MDRDIdList.add(generatedId);
// //retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
// //retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
// retString = executeSystemEvent("misc_drcr_rcp_dr", "pre_confirm", generatedId, xtraParams, conn);
// System.out.println("retString ::: " + retString);
// if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
// {
// isError=false;
// }
// else
// {
// isError=true;
// break;
// }
//
// }*/
// }
// }
// }
/*if(!isError)
{
mapSet = (Set) DRNxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
for(int ctr=0;ctr<CRNxmlList.size();ctr++)
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@DRNxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
returnString = saveData(siteCode,CRNxmlList.get(ctr),xtraParams,conn);
if (returnString.indexOf("Success") < -1)
{
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
......@@ -620,102 +689,186 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError = 0;
//countError = updateIdinCB(generatedId,tranID,valueString,conn);
countError = updateIdinCB(generatedId,tranID,valueStringList,"I",conn);
//if(countError == 0)
if(countError < valueStringList.size())
CRNIdList.add(generatedId);
if( "Y".equalsIgnoreCase( autoConfirm ) )
{
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
CRNIdList.add(generatedId);
//retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
//retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
retString = executeSystemEvent("drcrrcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
}
else
{
isError=true;
break;
}
}
}
}
}
*/
if(!isError)
{
if(CRNxmlMap.size()>0)
{
mapSet = (Set) CRNxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@CRNxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
{
System.out.println("@S@ inside debit ["+countError+"]");
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
DRNIdList.add(generatedId);
else
{
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError = 0;
countError = updateIdinCB(generatedId,tranID,valueStringList,"I",conn);
if(countError < valueStringList.size())
{
System.out.println("@S@ inside credit ["+countError+"]");
isError=true;
}
CRNIdList.add(generatedId);
}
}
}
}
}
/* Commented by santosh on 23/NOV/2017
* if(!isError)
{
for(int ctr=0;ctr<DRNxmlList.size();ctr++)
if(!isError)
{
returnString = saveData(siteCode,DRNxmlList.get(ctr),xtraParams,conn);
if (returnString.indexOf("Success") < -1)
if(DRNxmlMap.size()>0)
{
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
DRNIdList.add(generatedId);
if( "Y".equalsIgnoreCase( autoConfirm ) )
mapSet = (Set) DRNxmlMap.entrySet();
mapIterator = mapSet.iterator();
while (mapIterator.hasNext())
{
mapEntry = (Map.Entry) mapIterator.next();
keyString = (String) mapEntry.getKey();
//valueString = (String) mapEntry.getValue();
valueStringList = (ArrayList<String>) mapEntry.getValue();
System.out.println("keyString["+keyString+"]valueString["+valueStringList+"]");
returnString="";
returnString = saveData(siteCode,keyString,xtraParams,conn);
System.out.println("@S@DRNxmlMapreturnString["+returnString+"]");
if (returnString.indexOf("Success") <= -1)
{
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
DRNIdList.add(generatedId);
//retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
//retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
retString = executeSystemEvent("drcrrcp_dr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
}
else
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
countError = 0;
//countError = updateIdinCB(generatedId,tranID,valueString,conn);
countError = updateIdinCB(generatedId,tranID,valueStringList,"I",conn);
//if(countError == 0)
if(countError < valueStringList.size())
{
System.out.println("@S@ inside debit ["+countError+"]");
isError=true;
break;
}
DRNIdList.add(generatedId);
}
}
}
}
}*/
System.out.println("MDRCIdList["+MDRCIdList+"]");
System.out.println("MDRDIdList["+MDRDIdList+"]");
System.out.println("CRNIdList["+CRNIdList+"]");
System.out.println("DRNIdList["+DRNIdList+"]");
System.out.println("isError : ["+isError+"]");
if(!isError)
{
generatedId="";
if( "Y".equalsIgnoreCase( autoConfirm ) )
/* Commented by santosh on 23/NOV/2017
* if(!isError)
{
conn.commit();
for(int idctr=0;idctr<MDRCIdList.size();idctr++)
for(int ctr=0;ctr<DRNxmlList.size();ctr++)
{
generatedId=MDRCIdList.get(idctr);
retString = executeSystemEvent("misc_drcr_rcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
returnString = saveData(siteCode,DRNxmlList.get(ctr),xtraParams,conn);
if (returnString.indexOf("Success") < -1)
{
isError=false;
conn.commit();
System.out.println("@@@@@@1: Failed"+returnString);
isError=true;
break;
}
else
{
isError=true;
conn.rollback();
//break;
System.out.println("@@@@@@2: Success"+returnString);
isError=false;
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
DRNIdList.add(generatedId);
if( "Y".equalsIgnoreCase( autoConfirm ) )
{
dom = genericUtility.parseString(returnString);
System.out.println("dom>>>"+dom);
generatedId = genericUtility.getColumnValue("TranID",dom);
DRNIdList.add(generatedId);
//retString = retrieveMiscDrcrRcp("drcrrcp_cr",drNtTranId,xtraParams,"N" );
//retString = autoConfirmRecord("drcrrcp_cr", drNtTranId, xtraParams);
retString = executeSystemEvent("drcrrcp_dr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
}
else
{
isError=true;
break;
}
}
}
}
//if(!isError)
//{
for(int idctr=0;idctr<MDRDIdList.size();idctr++)
}*/
System.out.println("MDRCIdList["+MDRCIdList+"]");
System.out.println("MDRDIdList["+MDRDIdList+"]");
System.out.println("CRNIdList["+CRNIdList+"]");
System.out.println("DRNIdList["+DRNIdList+"]");
System.out.println("isError : ["+isError+"]");
}//end of stm type C added by nandkumar gadkari on 01/10/19
if(!isError)
{
if ("C".equalsIgnoreCase(settleMethod)) // added by nandkumar gadkari on 01/10/19 for creditnote only
{
generatedId="";
if( "Y".equalsIgnoreCase( autoConfirm ) )
{
conn.commit();
for(int idctr=0;idctr<MDRCIdList.size();idctr++)
{
generatedId=MDRDIdList.get(idctr);
retString = executeSystemEvent("misc_drcr_rcp_dr", "pre_confirm", generatedId, xtraParams, conn);
generatedId=MDRCIdList.get(idctr);
retString = executeSystemEvent("misc_drcr_rcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
......@@ -729,49 +882,68 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
//break;
}
}
//}
//if(!isError)
//{
for(int idctr=0;idctr<CRNIdList.size();idctr++)
{
generatedId=CRNIdList.get(idctr);
retString = executeSystemEvent("drcrrcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
//if(!isError)
//{
for(int idctr=0;idctr<MDRDIdList.size();idctr++)
{
isError=false;
conn.commit();
}
else
{
isError=true;
conn.rollback();
break;
generatedId=MDRDIdList.get(idctr);
retString = executeSystemEvent("misc_drcr_rcp_dr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
conn.commit();
}
else
{
isError=true;
conn.rollback();
//break;
}
}
}
//}
//if(!isError)
//{
for(int idctr=0;idctr<DRNIdList.size();idctr++)
{
generatedId=DRNIdList.get(idctr);
retString = executeSystemEvent("drcrrcp_dr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
//}
//if(!isError)
//{
for(int idctr=0;idctr<CRNIdList.size();idctr++)
{
isError=false;
conn.commit();
generatedId=CRNIdList.get(idctr);
retString = executeSystemEvent("drcrrcp_cr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
conn.commit();
}
else
{
isError=true;
conn.rollback();
break;
}
}
else
//}
//if(!isError)
//{
for(int idctr=0;idctr<DRNIdList.size();idctr++)
{
isError=true;
conn.rollback();
//break;
generatedId=DRNIdList.get(idctr);
retString = executeSystemEvent("drcrrcp_dr", "pre_confirm", generatedId, xtraParams, conn);
System.out.println("retString ::: " + retString);
if(retString.indexOf("VTSUCC1") > -1 || retString.indexOf("CONFSUCCES") > -1)
{
isError=false;
conn.commit();
}
else
{
isError=true;
conn.rollback();
//break;
}
}
}
//}
}
//}
}
}
// Added by saiprasad G.START [When the settlement method is "value replacement"
// & "quantity replacement" in charge back then data inserted into scheme
// balance table]
......@@ -780,8 +952,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
System.out.println("tranId::[" + tranID + "]");
//chargeBakSql = "SELECT CUST_CODE, SETTLE_MTH, SITE_CODE FROM CHARGE_BACK WHERE TRAN_ID=?";
chargeBakSql = "SELECT CUST_CODE, SETTLE_MTH FROM CHARGE_BACK WHERE TRAN_ID=?";
PreparedStatement preparedStatement = null, preparedStatement1 = null;
ResultSet resultSet = null;
/*PreparedStatement preparedStatement = null, preparedStatement1 = null;
ResultSet resultSet = null;*///commented by nandkumar gadkari on 1/10/19
preparedStatement = conn.prepareStatement(chargeBakSql);
preparedStatement.setString(1, tranID);
resultSet = preparedStatement.executeQuery();
......@@ -859,15 +1031,15 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
preparedStatement = null;
}*/
// For the charge_back_repl
secondarySchSql = "SELECT ITEM_CODE__REPL,FREE_QTY,FREE_VALUE,OFFER FROM CHARGE_BACK_REPL WHERE TRAN_ID=?";
secondarySchSql = "SELECT ITEM_CODE__REPL,FREE_QTY,FREE_VALUE,OFFER ,ITEM_CODE,FREE_VALUE FROM CHARGE_BACK_REPL WHERE TRAN_ID=?";// ITEM_CODE AND FREE_VALUE ADDED BY NANDKUMAR GADKARI ON 1/10/19
preparedStatement1 = conn.prepareStatement(secondarySchSql);
preparedStatement1.setString(1, tranID);
rs = preparedStatement1.executeQuery();
while (rs.next())
{
itemCodeRepl = E12GenericUtility.checkNull(rs.getString("ITEM_CODE__REPL"));
freeQty = rs.getInt("FREE_QTY");
freeVaule = rs.getInt("FREE_VALUE");
itemCodeRepl = (E12GenericUtility.checkNull(rs.getString("ITEM_CODE__REPL"))).trim();
freeQty = rs.getDouble("FREE_QTY");// chnage int to double by nandkumar gadkari on 1/10/19
freeVaule = rs.getDouble("FREE_VALUE");// chnage int to double by nandkumar gadkari on 1/10/19
offer = E12GenericUtility.checkNull(rs.getString("OFFER"));
if (offer.length() <= 0)
......@@ -878,6 +1050,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
itemCodeRepl = "X";
}
// effective from
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
Date confDate = new Date();
......@@ -947,7 +1120,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
}
else
{
int freeBalQty = 0, freeBalVal = 0;
double freeBalQty = 0, freeBalVal = 0; // chnage int to double by nandkumar gadkari on 1/10/19
String getBalanceItem = "SELECT BALANCE_FREE_QTY, BALANCE_FREE_VALUE from SCHEME_BALANCE WHERE CUST_CODE = ? AND ITEM_CODE = ? AND SCHEME_CODE = ? and SITE_CODE = ?";
preparedStatement = conn.prepareStatement(getBalanceItem);
preparedStatement.setString(1, custCode1);
......@@ -957,8 +1130,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
resultSet = preparedStatement.executeQuery();
if(resultSet.next())
{
freeBalQty = resultSet.getInt("BALANCE_FREE_QTY");
freeBalVal = resultSet.getInt("BALANCE_FREE_VALUE");
freeBalQty = resultSet.getDouble("BALANCE_FREE_QTY");
freeBalVal = resultSet.getDouble("BALANCE_FREE_VALUE");
}
resultSet.close();
preparedStatement.close();
......@@ -971,8 +1144,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
PreparedStatement pStmt = conn.prepareStatement(updateScheme);
pStmt.setTimestamp(1, effFrom1);
pStmt.setTimestamp(2, vaildUpto1);
pStmt.setInt(3, freeBalQty);
pStmt.setInt(4, freeBalVal);
pStmt.setDouble(3, freeBalQty);
pStmt.setDouble(4, freeBalVal);
pStmt.setString(5, custCode1);
pStmt.setString(6, itemCodeRepl);
pStmt.setString(7, offer);
......@@ -990,8 +1163,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
PreparedStatement pStmt1 = conn.prepareStatement(updateScheme1);
pStmt1.setTimestamp(1, effFrom1);
pStmt1.setTimestamp(2, vaildUpto1);
pStmt1.setInt(3, freeBalQty);
pStmt1.setInt(4, freeBalVal);
pStmt1.setDouble(3, freeBalQty);
pStmt1.setDouble(4, freeBalVal);
pStmt1.setString(5, custCode2);
pStmt1.setString(6, itemCodeRepl);
pStmt1.setString(7, offer);
......@@ -1006,8 +1179,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
}
}
//Added by Saiprasad G. on 24-JAN-19 START [For calculating used amount and amount of scheme approval]
int amt = 0, usedAmt = 0,usedAmtTrace=0,balanceAmt=0;
int updatedFreeAmt = freeVaule;
double amt = 0, usedAmt = 0,usedAmtTrace=0,balanceAmt=0;// change int to double by nandkumar gadkari on 01/10/19
double updatedFreeAmt = freeVaule; // change int to double by nandkumar gadkari on 01/10/19
String apprvTranID = "";
PreparedStatement updateApprvPstmt = null;
String getApprvData = "SELECT TRAN_ID,AMOUNT,USED_AMT FROM SCHEME_APPRV WHERE SCHEME_CODE = ? AND CUST_CODE__BILL = ? AND APRV_STATUS = ? and AMOUNT > 0";
......@@ -1023,8 +1196,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
System.out.println("Custcode1"+custCode1);
apprvTranID = resultSet.getString("TRAN_ID");
amt = resultSet.getInt("AMOUNT");
usedAmt = resultSet.getInt("USED_AMT");
amt = resultSet.getDouble("AMOUNT");
usedAmt = resultSet.getDouble("USED_AMT");
System.out.println("usedAmt : "+usedAmt);
System.out.println("apprvTranID : "+apprvTranID);
System.out.println("Amount : "+amt);
......@@ -1041,8 +1214,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
System.out.println("updatedFreeAmt >= amt ");
updatedFreeAmt = updatedFreeAmt - amt;
updateApprvPstmt = conn.prepareStatement(updateApprv);
updateApprvPstmt.setInt(1, 0);
updateApprvPstmt.setInt(2,usedAmtTrace);
updateApprvPstmt.setDouble(1, 0);
updateApprvPstmt.setDouble(2,usedAmtTrace);
updateApprvPstmt.setString(3, apprvTranID);
int partialUpd = updateApprvPstmt.executeUpdate();
System.out.println("partialUpd :: "+partialUpd);
......@@ -1052,11 +1225,11 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
System.out.println("Else of updatedFreeAmt >= amt");
updatedFreeAmt = Math.abs(updatedFreeAmt);
int chgAmt = amt - updatedFreeAmt;
double chgAmt = amt - updatedFreeAmt;
balanceAmt=updatedFreeAmt + usedAmt;
updateApprvPstmt = conn.prepareStatement(updateApprv);
updateApprvPstmt.setInt(1, chgAmt);
updateApprvPstmt.setInt(2, balanceAmt);
updateApprvPstmt.setDouble(1, chgAmt);
updateApprvPstmt.setDouble(2, balanceAmt);
updateApprvPstmt.setString(3, apprvTranID);
int fullUpda = updateApprvPstmt.executeUpdate();
System.out.println("fullUpda :: "+fullUpda);
......@@ -4173,7 +4346,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
return map;
}
//Added by Saiprasad G. on 24-JAN-19 START [For inserting the data in scheme trace]
public void insertSchemeTrace(Timestamp tranDate,String schemeAprvId,String custCode,String schemeCode,int usedAmt,int balanceAmt) throws ITMException
public void insertSchemeTrace(Timestamp tranDate,String schemeAprvId,String custCode,String schemeCode,double usedAmt,double balanceAmt) throws ITMException
{
System.out.println("In ChrgBckLocConf.insertSchemeTrace():");
PreparedStatement schemeTracePstmt=null;
......@@ -4193,8 +4366,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
schemeTracePstmt.setString(3, schemeAprvId);
schemeTracePstmt.setString(4, custCode);
schemeTracePstmt.setString(5, schemeCode);
schemeTracePstmt.setInt(6, usedAmt);
schemeTracePstmt.setInt(7, balanceAmt);
schemeTracePstmt.setDouble(6, usedAmt);
schemeTracePstmt.setDouble(7, balanceAmt);
int i = schemeTracePstmt.executeUpdate();
System.out.println("data inserted in scheme_trace:"+i);
if(schemeTracePstmt!=null)
......
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