Skip to content

B
business-java
Commit 2285bf29 authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 03/05/16 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101476 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b674bd02
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 143 deletions
webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java
View file @ 2285bf29
...@@ -173,7 +173,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -173,7 +173,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
//Changed by Samadhan on 10/02/2016 for invoice id is blank Start //Changed by Samadhan on 10/02/2016 for invoice id is blank Start
if(invoiceId.length() != 0 && invoiceId != null) if(invoiceId.length() != 0 && invoiceId != null)
{ {
//Changed by Samadhan on 10/02/2016 for invoice id is blank end //Changed by Samadhan on 10/02/2016 for invoice id is blank end
if("success".equalsIgnoreCase(refundReturnStr)) if("success".equalsIgnoreCase(refundReturnStr))
{ {
//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start //Changed by samadhan on 16/6/2015 for status tracking update in magento system.start
...@@ -218,7 +218,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -218,7 +218,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
errString = confString; errString = confString;
} }
//Changed by Samadhan on 8/02/2016 for other rcp_mode end //Changed by Samadhan on 8/02/2016 for other rcp_mode end
// return errString; // return errString;
...@@ -266,7 +266,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -266,7 +266,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
System.out.println("Calling send mail method start"); System.out.println("Calling send mail method start");
SendMailforSalesReturn(invoiceId,tranId,tranType,errString,xtraParams,conn) ; //Added By Manish for send mail to customer for Refund on 02/12/2015 SendMailforSalesReturn(invoiceId,tranId,tranType,errString,xtraParams,conn) ; //Added By Manish for send mail to customer for Refund on 02/12/2015
System.out.println("Calling send mail method End"); System.out.println("Calling send mail method End");
//Changed by Samadhan on 8/02/2016 for invoice id is blank //Changed by Samadhan on 8/02/2016 for invoice id is blank
} }
return errString; return errString;
} }
...@@ -441,69 +441,69 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -441,69 +441,69 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
//else //else
//{ //{
} }
//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End //Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End
// select all necessary details from receivables // select all necessary details from receivables
sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY," sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,"
+ "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO = ?"; + "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO = ?";
//+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) "; //+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdCrn); pstmt.setString(1, tranIdCrn);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
rowCnt++; rowCnt++;
tranSer = checkNull(rs.getString("TRAN_SER")); tranSer = checkNull(rs.getString("TRAN_SER"));
tranIdRec = checkNull(rs.getString("TRAN_ID")); tranIdRec = checkNull(rs.getString("TRAN_ID"));
refDate = rs.getTimestamp("REF_DATE"); refDate = rs.getTimestamp("REF_DATE");
currCode = checkNull(rs.getString("CURR_CODE")); currCode = checkNull(rs.getString("CURR_CODE"));
exchRate = rs.getDouble("EXCH_RATE"); exchRate = rs.getDouble("EXCH_RATE");
custCode = checkNull(rs.getString("CUST_CODE")); custCode = checkNull(rs.getString("CUST_CODE"));
acctCode = checkNull(rs.getString("ACCT_CODE")); acctCode = checkNull(rs.getString("ACCT_CODE"));
// cctrCode = checkNull(rs.getString("CCTR_CODE")); // cctrCode = checkNull(rs.getString("CCTR_CODE"));
cctrCode = rs.getString("CCTR_CODE"); cctrCode = rs.getString("CCTR_CODE");
dueDate = rs.getTimestamp("DUE_DATE"); dueDate = rs.getTimestamp("DUE_DATE");
finEntity = checkNull(rs.getString("FIN_ENTITY")); finEntity = checkNull(rs.getString("FIN_ENTITY"));
totAmt = rs.getDouble("TOT_AMT"); totAmt = rs.getDouble("TOT_AMT");
adjAmt = rs.getDouble("ADJ_AMT"); adjAmt = rs.getDouble("ADJ_AMT");
bankCode = checkNull(rs.getString("BANK_CODE")); bankCode = checkNull(rs.getString("BANK_CODE"));
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("receivables totAmt------->>["+totAmt+"]"); System.out.println("receivables totAmt------->>["+totAmt+"]");
System.out.println("receivables adjAmt------->>["+adjAmt+"]"); System.out.println("receivables adjAmt------->>["+adjAmt+"]");
System.out.println("receivables rowCnt------->>["+adjAmt+"]"); System.out.println("receivables rowCnt------->>["+adjAmt+"]");
if(rowCnt == 0) if(rowCnt == 0)
{ {
errCode = "VTNOREC1"; //No records found for processing. errCode = "VTNOREC1"; //No records found for processing.
errorString = vdt.getErrorString("invoice_id",errCode,userId); errorString = vdt.getErrorString("invoice_id",errCode,userId);
return errorString; return errorString;
} }
if((totAmt - adjAmt) >= 0) if((totAmt - adjAmt) >= 0)
{ {
errCode = "VTTOTAMT"; //don't process if receivables is not negetive. errCode = "VTTOTAMT"; //don't process if receivables is not negetive.
errorString = vdt.getErrorString("invoice_id",errCode,userId); errorString = vdt.getErrorString("invoice_id",errCode,userId);
return errorString; return errorString;
} }
sql = "UPDATE RECEIVABLES SET ADJ_AMT = TOT_AMT, STAT_DATE = ?,STATUS = ? " sql = "UPDATE RECEIVABLES SET ADJ_AMT = TOT_AMT, STAT_DATE = ?,STATUS = ? "
+ "WHERE REF_NO = ? "; + "WHERE REF_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, currDate); pstmt.setTimestamp(1, currDate);
pstmt.setString(2,"A"); pstmt.setString(2,"A");
//pstmt.setString(3,invoiceId); //pstmt.setString(3,invoiceId);
pstmt.setString(3,tranIdCrn); pstmt.setString(3,tranIdCrn);
rowCnt = pstmt.executeUpdate(); rowCnt = pstmt.executeUpdate();
System.out.println("receivables rowCnt------->>["+rowCnt+"]"); System.out.println("receivables rowCnt------->>["+rowCnt+"]");
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf Start //Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf Start
/*sql = "SELECT SALE_ORDER FROM INVOICE WHERE INVOICE_ID = ?"; /*sql = "SELECT SALE_ORDER FROM INVOICE WHERE INVOICE_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceId); pstmt.setString(1, invoiceId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -516,97 +516,97 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -516,97 +516,97 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("saleOrder====>>["+saleOrder+"]");*/ System.out.println("saleOrder====>>["+saleOrder+"]");*/
//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End //Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End
//retString= recPayGetData(siteCode,saleOrder,custCode,xtraParams,conn);
// Generate misc_payables tran_id
if("R-ADV".equalsIgnoreCase(tranSer)) //retString= recPayGetData(siteCode,saleOrder,custCode,xtraParams,conn);
{ // Generate misc_payables tran_id
refserPay = "RCPADV";
}
else
{
refserPay = "RCVCNV";
}
tranId = generateTranTd("T_PAYABLES",tranDate,siteCode,conn);
System.out.println("generateTranTd tranid------->>["+tranId+"]");
// Insert into misc_payables if("R-ADV".equalsIgnoreCase(tranSer))
{
refserPay = "RCPADV";
}
else
{
refserPay = "RCVCNV";
}
tranId = generateTranTd("T_PAYABLES",tranDate,siteCode,conn);
System.out.println("generateTranTd tranid------->>["+tranId+"]");
sql = "INSERT INTO MISC_PAYABLES (TRAN_ID,TRAN_SER,TRAN_DATE,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE," // Insert into misc_payables
+ "SUNDRY_CODE,SUNDRY_TYPE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,SITE_CODE,"
+ "TOT_AMT,ADJ_AMT,STATUS,STATUS_DATE,BANK_CODE) "
+ "VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,? )";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setString(2,tranSer);//refserPay
pstmt.setTimestamp(3,currDate);
pstmt.setString(4,tranIdCrn);//invoiceId
pstmt.setTimestamp(5,refDate);
pstmt.setString(6,currCode);
pstmt.setDouble(7, exchRate);
pstmt.setString(8,custCode);
pstmt.setString(9,"C");
pstmt.setString(10,acctCode);
pstmt.setString(11,cctrCode);
pstmt.setTimestamp(12,dueDate);
pstmt.setString(13,finEntity);
pstmt.setString(14,siteCode);
pstmt.setDouble(15, totAmt * -1);
pstmt.setDouble(16, adjAmt * -1);
pstmt.setString(17,"U");
pstmt.setTimestamp(18,currDate);
pstmt.setString(19,bankCode);
miscCnt = pstmt.executeUpdate();
System.out.println("MISC_PAYABLES miscCnt------->>["+miscCnt+"]");
pstmt.close(); sql = "INSERT INTO MISC_PAYABLES (TRAN_ID,TRAN_SER,TRAN_DATE,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE,"
pstmt = null; + "SUNDRY_CODE,SUNDRY_TYPE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,SITE_CODE,"
+ "TOT_AMT,ADJ_AMT,STATUS,STATUS_DATE,BANK_CODE) "
+ "VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,? )";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
pstmt.setString(2,tranSer);//refserPay
pstmt.setTimestamp(3,currDate);
pstmt.setString(4,tranIdCrn);//invoiceId
pstmt.setTimestamp(5,refDate);
pstmt.setString(6,currCode);
pstmt.setDouble(7, exchRate);
pstmt.setString(8,custCode);
pstmt.setString(9,"C");
pstmt.setString(10,acctCode);
pstmt.setString(11,cctrCode);
pstmt.setTimestamp(12,dueDate);
pstmt.setString(13,finEntity);
pstmt.setString(14,siteCode);
pstmt.setDouble(15, totAmt * -1);
pstmt.setDouble(16, adjAmt * -1);
pstmt.setString(17,"U");
pstmt.setTimestamp(18,currDate);
pstmt.setString(19,bankCode);
miscCnt = pstmt.executeUpdate();
System.out.println("MISC_PAYABLES miscCnt------->>["+miscCnt+"]");
pstmt.close();
pstmt = null;
//insert into receivables_adj //insert into receivables_adj
tranIdRecAdj = generateTranTd("T_MISC_REC_ADJ",tranDate,siteCode,conn); tranIdRecAdj = generateTranTd("T_MISC_REC_ADJ",tranDate,siteCode,conn);
System.out.println("generateTranTd tranid------->>["+tranId+"]"); System.out.println("generateTranTd tranid------->>["+tranId+"]");
sql = "INSERT INTO RECEIVABLES_ADJ( TRAN_ID,REF_SER,REF_NO,TOT_AMT,ADJ_AMT,REF_SER_ADJ,REF_NO_ADJ," sql = "INSERT INTO RECEIVABLES_ADJ( TRAN_ID,REF_SER,REF_NO,TOT_AMT,ADJ_AMT,REF_SER_ADJ,REF_NO_ADJ,"
+ "NET_AMT,TRAN_ID__RCV ) values (?,?,?,?,?,?,?,?,?)"; + "NET_AMT,TRAN_ID__RCV ) values (?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdRecAdj); pstmt.setString(1, tranIdRecAdj);
pstmt.setString(2,tranSer); pstmt.setString(2,tranSer);
pstmt.setString(3,tranIdCrn);//invoiceId pstmt.setString(3,tranIdCrn);//invoiceId
pstmt.setDouble(4, totAmt); pstmt.setDouble(4, totAmt);
pstmt.setDouble(5, adjAmt); pstmt.setDouble(5, adjAmt);
pstmt.setString(6,refserPay); pstmt.setString(6,refserPay);
pstmt.setString(7,tranId); pstmt.setString(7,tranId);
pstmt.setDouble(8,totAmt - adjAmt); pstmt.setDouble(8,totAmt - adjAmt);
pstmt.setString(9, tranIdRec); pstmt.setString(9, tranIdRec);
adjCnt = pstmt.executeUpdate(); adjCnt = pstmt.executeUpdate();
System.out.println("RECEIVABLES_ADJ adjCnt------->>["+adjCnt+"]"); System.out.println("RECEIVABLES_ADJ adjCnt------->>["+adjCnt+"]");
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("custCode------->>["+custCode+"]"); System.out.println("custCode------->>["+custCode+"]");
System.out.println(" miscCnt--->>["+miscCnt+"]adjCnt -->>["+adjCnt+"]"); System.out.println(" miscCnt--->>["+miscCnt+"]adjCnt -->>["+adjCnt+"]");
if(adjCnt > 0 && miscCnt > 0) if(adjCnt > 0 && miscCnt > 0)
{ {
retString = "Success"; retString = "Success";
} }
else else
{ {
retString = "Error"; retString = "Error";
} }
//} //}
} }
catch(Exception e) catch(Exception e)
...@@ -758,7 +758,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -758,7 +758,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt = null; pstmt = null;
System.out.println("rcpMode----->>["+rcpMode+"]"); System.out.println("rcpMode----->>["+rcpMode+"]");
//Changed by Samadhan on 11/01/2015 for received paypal transaction id. End //Changed by Samadhan on 11/01/2015 for received paypal transaction id. End
if(tokenInfo != null && tokenInfo.length() > 0) if(tokenInfo != null && tokenInfo.length() > 0)
{ {
Document dom1 = genericUtility.parseString(tokenInfo); Document dom1 = genericUtility.parseString(tokenInfo);
...@@ -963,7 +963,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -963,7 +963,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
xmlString.append("<remarks><![CDATA[" + "Generate Automatic payment" + "]]></remarks>"); xmlString.append("<remarks><![CDATA[" + "Generate Automatic payment" + "]]></remarks>");
xmlString.append("<net_amt><![CDATA[" + 0 + "]]></net_amt>"); xmlString.append("<net_amt><![CDATA[" + 0 + "]]></net_amt>");
xmlString.append("<curr_code><![CDATA[" + checkNull(currCode) + "]]></curr_code>"); xmlString.append("<curr_code><![CDATA[" + checkNull(currCode) + "]]></curr_code>");
xmlString.append("<exch_rate><![CDATA[" + mexrate + "]]></exch_rate>"); // xmlString.append("<exch_rate><![CDATA[" + mexrate + "]]></exch_rate>");
// Changed by Manish on 03/05/16 as per Shailes Sir [satrt]
xmlString.append("<exch_rate><![CDATA[" + exchRate + "]]></exch_rate>");
// Changed by Manish on 03/05/16 as per Shailes Sir [end]
xmlString.append("<net_amt__bc><![CDATA[" + 0 + "]]></net_amt__bc>"); xmlString.append("<net_amt__bc><![CDATA[" + 0 + "]]></net_amt__bc>");
xmlString.append("<site_code><![CDATA[" + checkNull(siteCode) + "]]></site_code>"); xmlString.append("<site_code><![CDATA[" + checkNull(siteCode) + "]]></site_code>");
//xmlString.append("<site_descr><![CDATA[" + checkNull(siteDescr) + "]]></site_descr>");/ //xmlString.append("<site_descr><![CDATA[" + checkNull(siteDescr) + "]]></site_descr>");/
...@@ -2589,7 +2594,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2589,7 +2594,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
mailFlag = checkNull(discommon.getDisparams("999999","DDWMS_MAIL_FLAG",conn)); mailFlag = checkNull(discommon.getDisparams("999999","DDWMS_MAIL_FLAG",conn));
attachFlag= checkNull(discommon.getDisparams("999999","DDWMS_ATTACHMENT_FLAG",conn)); attachFlag= checkNull(discommon.getDisparams("999999","DDWMS_ATTACHMENT_FLAG",conn));
System.out.println("mailFlag-------"+mailFlag); System.out.println("mailFlag-------"+mailFlag);
/*formatCode = loginSite+'_'+tranType; // Sending mail for customer. /*formatCode = loginSite+'_'+tranType; // Sending mail for customer.
formatCodeCSR = loginSite+'_'+tranType+'_'+"CSR";*/ // Sending mail for CSR team. formatCodeCSR = loginSite+'_'+tranType+'_'+"CSR";*/ // Sending mail for CSR team.
sql = "SELECT S.SITE_CODE FROM SORDER S, INVOICE I WHERE S.SALE_ORDER = I.SALE_ORDER AND I.INVOICE_ID = ?"; sql = "SELECT S.SITE_CODE FROM SORDER S, INVOICE I WHERE S.SALE_ORDER = I.SALE_ORDER AND I.INVOICE_ID = ?";
...@@ -2605,10 +2610,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2605,10 +2610,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
rs=null; rs=null;
pstmt=null; pstmt=null;
System.out.println("Site Code for Sale Order["+siteCodeforSorder+"]"); System.out.println("Site Code for Sale Order["+siteCodeforSorder+"]");
formatCode = siteCodeforSorder+'_'+tranType; formatCode = siteCodeforSorder+'_'+tranType;
formatCodeCSR = siteCodeforSorder+'_'+tranType+'_'+"CSR"; formatCodeCSR = siteCodeforSorder+'_'+tranType+'_'+"CSR";
System.out.println("formatCode=======["+formatCode+"]"); System.out.println("formatCode=======["+formatCode+"]");
System.out.println("formatCode=======["+formatCodeCSR+"]"); System.out.println("formatCode=======["+formatCodeCSR+"]");
if("Y".equalsIgnoreCase(mailFlag) && formatCode!= null && formatCodeCSR!= null && formatCode.length() > 0 && formatCodeCSR.length() > 0 ) if("Y".equalsIgnoreCase(mailFlag) && formatCode!= null && formatCodeCSR!= null && formatCode.length() > 0 && formatCodeCSR.length() > 0 )
......
webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java
View file @ 2285bf29
...@@ -1483,7 +1483,9 @@ public class CommonWmsUtil { ...@@ -1483,7 +1483,9 @@ public class CommonWmsUtil {
} }
if(!trackNo.equals("")) if(!trackNo.equals(""))
{ {
trackNo = trackNo.substring(1,trackNo.length()-1); //trackNo = trackNo.substring(1,trackNo.length()-1);
trackNo = trackNo.substring(0,trackNo.length()-1);
System.out.println("trackNo is["+trackNo+"]");
} }
} }
catch (Exception e) catch (Exception e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment