Skip to content

B
business-java
Commit 30d0f721 authored by pchavan's avatar pchavan
Browse files
Options

to send auto mail. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211552 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9d10725e
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 124 deletions
webitm-dis/src/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ 30d0f721
......@@ -180,7 +180,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
/* refDate = checkNull(this.genericUtility.getColumnValue("ref_date", headerDom));*/
orderType=e12GenericUtility.getColumnValue("order_type",headerDom);
//System.out.println("orderType :"+orderType);
fromSaleOrder=checkNullAndTrim(e12GenericUtility.getColumnValue("tran_id__fr",headerDom));
......@@ -203,18 +202,15 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//System.out.println("fromDateStr :"+fromDateStr);
toDateStr=checkNullAndTrim(e12GenericUtility.getColumnValue("desp_date__to",headerDom));
//System.out.println("toDateStr :"+toDateStr);
//SETTING OF FROM SO TO 0 IF IT IS NULL
if( fromSaleOrder == null || fromSaleOrder.trim().length() == 0 )
{
fromSaleOrder = "0";
}
if( toSaleOrder == null || toSaleOrder.trim().length() == 0 )
{
toSaleOrder = "Z";
}
//SETTING CUST_CODE FROM TO 0
if( fromCustCode == null || fromCustCode.trim().length() == 0 )
{
......@@ -224,8 +220,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
toCustCode = "Z";
}
// Added by Sneha on 08/02/2017, for validation [Start]
/* System.out.println("----------- fromSaleOrder ------------"+fromSaleOrder);
System.out.println("----------- toSaleOrder ------------"+toSaleOrder);
......@@ -251,7 +245,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
return retString;
}
}
if(!"0".equalsIgnoreCase(fromCustCode) && !"Z".equalsIgnoreCase(toCustCode))
{
count = 0;
......@@ -263,7 +256,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
return retString;
}
}
if(fromDateStr.length() == 0)
{
retString = itmDBAccessEJB.getErrorString("", "VTPOSTORD2", "","", conn);
......@@ -294,7 +286,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
// Added by Sneha on 08/02/2017, for validation [End]
//System.out.println("clubPendingOrd :"+clubPendingOrd);
//Added by wasim on 21-APR-17 for site code validation if it blank [START]
if(siteCodeShip == null || siteCodeShip.trim().length() == 0)
{
......@@ -319,7 +310,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
pstmt.close();pstmt = null;
}
if(cnt == 0)
{
retString = itmDBAccessEJB.getErrorString("", "VTSITEXT", "","", conn);
......@@ -327,7 +317,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
//Added by wasim on 21-APR-17 for site code validation if it blank [END]
if(clubPendingOrd != null && clubPendingOrd.equalsIgnoreCase("Y") )
{
sql="select count(1) from customer where cust_code= ? ";
......@@ -370,7 +359,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
// System.out.println("retString if toCustCode is not present>>> 243: "+retString);
return retString;
}
}
// From date logic modified as now date format is picked up from ini file
......@@ -733,8 +721,44 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//Modified by Azhar K. on [07-05-2019][Start]
HashMap additionalMap = null;
//Modified by Azhar K. on [07-05-2019][End]
//Added By PriyankaC on 16OCt2019.[Start]
String toAddr = "",ccAddr = "",bccAddr = "",subject = "",body = "",templateName = "",attachObjLinks = "",attachments = "";
String templateCode = fnComm.getFinparams("999999","GET_MAIL_FORMAT", conn);
String SendEmailOnNotify = "";
String xmlString = "",reportType = "PDF",usrLevel = "",sordListStr="";
Calendar currentDate = Calendar.getInstance();
// Timestamp today = null;
//Added By PriyankaC on 16OCt2019.[END]
try
{
//Added By PriyankaC on 16Oct2019 [START].
ArrayList soList = new ArrayList();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDateStr = sdf.format(currentDate.getTime());
Timestamp today = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("today date " +today);
DBAccessEJB dbAccess = new DBAccessEJB();
String loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
UserInfoBean userInfo = dbAccess.createUserInfo(loginCode);
sql = "select usr_lev from users where code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
if (rs.next())
{
usrLevel = checkNull(rs.getString("usr_lev"));
userInfo.setUserLevel(usrLevel);
}
else
{
userInfo.setUserLevel("0");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Added By PriyankaC on 16Oct2019 [END].
//Modified by Azhar K. on [07-05-2019][Start]
additionalMap = new HashMap();
//Modified by Azhar K. on [07-05-2019][End]
......@@ -982,9 +1006,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//Modified by Azhar K. on [07-05-2019][End]
endTime2 = System.currentTimeMillis();
System.out.println("createDespatch time taken for SO [" + SaleOrder + "] ["+(endTime2-startTime2)/1000+"] seconds");
System.out.println("Before confirm Calling sendMailonConfirm");
}
// System.out.println("ErrCode from Despatch creation===="+errCode);
//added by nandkumar gadkari on 08/05/19 --------start---------for stock mismatch case
if(errString !=null && errString.trim().length() > 0)
{
......@@ -993,7 +1017,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
connCP.rollback();
}
}
else
{
......@@ -1002,6 +1025,65 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
connCP.commit();
}
System.out.println("Before confirm Calling sendMailonConfirm");
cnt = 0;
//Added by PriyankaC to send mail.
System.out.println("Value of postUptoInvoice and clubOrder" +postUptoInvoice +""+clubOrder);
if("I".equalsIgnoreCase(postUptoInvoice) )
{
if( "Y".equalsIgnoreCase(clubOrder))
{
sql = " select sale_order from sorder where sale_order >= ? and sale_order <= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, fromSaleOrder);
pstmt.setString(1, toSaleOrder);
rs = pstmt.executeQuery();
while (rs.next())
{
soList.add(checkNull(rs.getString("sale_order")));
}
rs.close();
rs = null;
pstmt.close();
}
else
{
soList.add(SaleOrder);
}
for (int ctr = 0; ctr < soList.size(); ctr++)
{
sql = "select max(invoice_id) as invoice_id from invoice where sale_order = ? and TRAN_DATE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,(String)(soList.get(ctr)));
pstmt.setTimestamp(2, today);
rs = pstmt.executeQuery();
if(rs.next())
{
invoiceId = checkNull(rs.getString("invoice_id"));
System.out.println("invoiceId :" +invoiceId);
if(invoiceId!= null && invoiceId.trim().length() >0)
{
errString = sendMailonConfirm(invoiceId,fromCustCode,templateCode,userInfo,conn);
}
}
rs.close();
rs = null;
pstmt.close();
}
//System.out.println("errString from send mail" +errString);
if(errString!= null && errString.trim().length() > 0)
{
String begPart = errString.substring(0,errString.indexOf("<message>")+9);
String endDesc = errString.substring(errString.indexOf("</description>"));
errString= begPart+"Invalid Data"+"</message><description><![CDATA[";
errString= errString+"retString "+errString+" "+"Mail Not Send to customer"+"]]>"+endDesc;
return errString;
}
System.out.println("After confirm Calling SendEmail");
}
//Added By PriyankaC to send the mail on invoice confirmation to customer on 16Oct2019.[Start]
}
//System.out.println("postLog:::"+erroLogSordItme);
for(Log log:erroLogSordItme)
......@@ -1010,7 +1092,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
//added by nandkumar gadkari on 08/05/19 --------end---------for stock mismatch case
//Changed By Nasruddin END 04-11-16
if (errCode == null || errCode.trim().length()==0)
{
//added By Pavan R on 2K18/Feb/12 for 'Ship complete Order' Flag not considered in Order Posting.[Start]
......@@ -1021,13 +1102,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
postSalOder.add(postedSO);
}
}
else
{
postSalOder.add(SaleOrder);
}
//postSalOder.add(SaleOrder);
//added By Pavan R on 2K18/Feb/12[End]
}
......@@ -1156,7 +1235,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
/*------------------------------------------------------------------------------*/
}
}
catch(Exception e)
{
......@@ -1164,14 +1242,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
e.printStackTrace();
throw new ITMException(e);
}
return errString;
}
//Modified by Anjali R. on [12/11/2018][DepatchConfirm class's object pass as parameter][Start]
//public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,Connection conn) throws ITMException
public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,Connection conn) throws ITMException, SQLException
......@@ -1474,21 +1546,15 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rs=null;
pstmt.close();
pstmt=null;
if(finAdjAmt>=netAmt)
{
errString=postordact.finSchemeInvAdj(siteCodeShip,itemSer,fromCustCode,invoiceId,netAmt,adjDrcrFlag, adjAdv,conn);
}
}
if( errString == null || errString.trim().length() == 0 )
{
//System.out.println("@@@@@@@@@@@@ postOrdCreditChk()...........finish.........");
//System.out.println("@@@@@@@@@@@@ InvoiceDrcrAdj()...........calling..........");
sql = " select tran_id from misc_drcr_rcp where sreturn_no in (select desp_id " +
" from despatch where desp_id in ( ? ) " +
" and case when FREIGHT_AMT_ADD is null then 0 else FREIGHT_AMT_ADD end > 0) ";
......@@ -1507,7 +1573,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//System.out.println("@@@@@@@@@@@ ls_drnid["+ls_drnid+"]");
String frtDrnArr[]=ls_drnid.split(",");
//System.out.println("@@@@@ frtDrnArr.length["+frtDrnArr.length+"]");
InvoiceDrcrAdj invoiceDrCrAdj1 = new InvoiceDrcrAdj();
errString = invoiceDrCrAdj1.invoiceDrcrAdj(siteCodeShip, invoiceId, custCodeBil, itemSer, netAmt, adjDrcrFlag, adjAdv, advAdj, adjNewProdInvFlag, frtDrnArr, conn);//toCustCode Change to custCodeBil by nandkumar gadkari on 12/08/19
//retString = invoiceDrCrAdj1.invoiceDrcrAdj(siteCodeShip, invoiceId, toCustCode, itemSer, netAmt, adjDrcrFlag, adjCustAdvFlag, advAdj, adjNewProdInvFlag, frtDrnArr, conn);
......@@ -1521,13 +1586,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
String forcedFlag="N";
String retString1=postOrdInvoicePost.invoicePosting(invoiceId, xtraParams, forcedFlag,conn);
postOrdInvoicePost = null;
//System.out.println("PostOrdInvoicePost return string >>>>"+retString1);
System.out.println("PostOrdInvoicePost return string >>>>"+retString1);
if( retString1 != null && retString1.trim().length() > 0 )
{
return retString1;
}
sql="update invoice set confirmed = 'Y',conf_date=?, emp_code__aprv = ? where invoice_id = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setTimestamp(1,sysDate);
......@@ -1537,65 +1600,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt.close();
pstmt=null;
//Added By PriyankaC to send the mail on invoice confirmation to customer on 16Oct2019.[Start]
System.out.println("After confirm Calling SendEmail");
sql = " select email_notify from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, fromCustCode);
rs = pstmt.executeQuery();
if (rs.next())
{
SendEmailOnNotify = checkNull(rs.getString("email_notify"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if("Y".equalsIgnoreCase(SendEmailOnNotify))
{
System.out.println("After confirm Calling SendEmail");
sql = "select SEND_TO ,COPY_TO ,BLIND_COPY ,SUBJECT , BODY_TEXT , MAIL_DESCR ,ATTACH_TEXT ,ATTACH_TYPE from MAIL_FORMAT WHERE FORMAT_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, templateCode);
rs = pstmt.executeQuery();
if (rs.next())
{
toAddr = checkNull(rs.getString("SEND_TO"));
ccAddr = checkNull(rs.getString("COPY_TO"));
bccAddr = checkNull(rs.getString("BLIND_COPY"));
subject = checkNull(rs.getString("SUBJECT"));
body = checkNull(rs.getString("BODY_TEXT"));
templateName = checkNull(rs.getString("MAIL_DESCR"));
attachments = checkNull(rs.getString("ATTACH_TEXT"));
attachObjLinks = checkNull(rs.getString("ATTACH_TYPE"));
//confirmed = checkNull(rs.getString("confirmed"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Before confirm Calling SendEmail with attachment");
errString = TransactionEmailTempltEJB.sendMail("invoice",userInfo,toAddr, ccAddr,bccAddr,subject,body,"","",invoiceId,attachments,"true",templateName,templateCode,"");
//errString = TransactionEmailTempltEJB.sendMail("invoice",userInfo,toAddr, ccAddr,bccAddr,subject,body,"","",invoiceId,attachments,"",templateName,templateCode,"");
System.out.println("After confirm Calling SendEmail with attachment" +errString);
if( errString != null && errString.trim().length() > 0 )
{
String begPart = errString.substring(errString.indexOf("<STATUS>")+8,errString.indexOf("</STATUS>"));
System.out.println("<STATUS> ::: " +begPart);
if("N".equalsIgnoreCase(begPart))
{
return errString;
}
else
{
errString="";
}
}
}
//Added By PriyankaC to send the mail on invoice confirmation to customer on 16Oct2019.[End]
//Added Arun by p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Start
String ediOption = "";
sql = "select edi_option from transetup where tran_window = ? ";
......@@ -1628,7 +1632,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
//Added Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Ended
//CreteCommCrNote creteCommCrNote = new CreteCommCrNote();
CalculateCommission calCom=new CalculateCommission();
commDrcrConf = checkNull(fnComm.getFinparams("999999", "COMM_DRCR_CONF", conn));
......@@ -1643,41 +1646,31 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if( errString == null || errString.trim().length() == 0 )
{
// AutoExciseDrNote autoExciseDrNote = new AutoExciseDrNote();
errString = postordact.autoExciseDrNote(invoiceId,xtraParams, conn);
//System.out.println("@@@@@@@@@5 autoExciseDrNote() errString["+errString+"]");
}
else
{
//System.out.println("@@@@@@@@@ error in autoExciseDrNote.autoExciseDrNote.....");
return errString;
}
}
else
{
//System.out.println("@@@@@@@@@ error in invoiceDrCrAdj1.invoiceDrcrAdj.....");
return errString;
}
}
else
{
//System.out.println("@@@@@@@@@ error in postOrdCreditChk.CreditCheck(paramMap, conn)......");
return errString;
//conn.rollback();
}
}
else
{
System.out.println("Invoice not Generated !!!!!!!!!!!!!!!!!!!!!!!!!!!");
conn.rollback();
}
......@@ -1687,15 +1680,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
throw new ITMException(e);
}
return errString;
}
return errString;
}
public int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws ITMException, Exception
{
......@@ -5994,8 +5981,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
if(noApplyCustList != null && noApplyCustList.length() > 0)
{
ls_noapply_cust = dist.getToken(ls_noapply_cust_list,",");
......@@ -6006,29 +5991,20 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
if(schemeCode != null)
{
ll_schcnt ++;
}
else if(ll_schcnt == 1 )
{
schemeCode = prevscheme;
}
System.out.println("ll_schcnt::"+ll_schcnt);
}
rs.close();
rs = null;
......@@ -6539,8 +6515,83 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
return mainStr;
}
//Added by Pavan R on 25/JAN/2K18 [End]
//Added By PriyankaC to send the mail on invoice confirmation to customer on 16Oct2019.[START]
private String sendMailonConfirm(String invoiceId, String fromCustCode , String templateCode ,UserInfoBean userInfo,Connection conn ) throws SQLException, ITMException
{
PreparedStatement pstmt=null;
ResultSet rs = null;
String SendEmailOnNotify = "",sql="";
String errString = "";
String toAddr = "",ccAddr = "",bccAddr = "",subject = "",body = "",templateName = "",attachObjLinks = "",attachments = "";
String xmlString = "",reportType = "PDF",usrLevel = "";
System.out.println("invoiceId in send mail:" +invoiceId);
sql = " select email_notify from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, fromCustCode);
rs = pstmt.executeQuery();
if (rs.next())
{
SendEmailOnNotify = checkNull(rs.getString("email_notify"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if("Y".equalsIgnoreCase(SendEmailOnNotify))
{
System.out.println("After confirm Calling SendEmail");
sql = "select SEND_TO ,COPY_TO ,BLIND_COPY ,SUBJECT , BODY_TEXT , MAIL_DESCR ,ATTACH_TEXT ,ATTACH_TYPE from MAIL_FORMAT WHERE FORMAT_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, templateCode);
rs = pstmt.executeQuery();
if (rs.next())
{
toAddr = checkNull(rs.getString("SEND_TO"));
ccAddr = checkNull(rs.getString("COPY_TO"));
bccAddr = checkNull(rs.getString("BLIND_COPY"));
subject = checkNull(rs.getString("SUBJECT"));
body = checkNull(rs.getString("BODY_TEXT"));
templateName = checkNull(rs.getString("MAIL_DESCR"));
attachments = checkNull(rs.getString("ATTACH_TEXT"));
attachObjLinks = checkNull(rs.getString("ATTACH_TYPE"));
//confirmed = checkNull(rs.getString("confirmed"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Before confirm Calling SendEmail with attachment");
errString = TransactionEmailTempltEJB.sendMail("invoice",userInfo,toAddr, ccAddr,bccAddr,subject,body,"","",invoiceId,attachments,"true",templateName,templateCode,"");
//errString = TransactionEmailTempltEJB.sendMail("invoice",userInfo,toAddr, ccAddr,bccAddr,subject,body,"","",invoiceId,attachments,"",templateName,templateCode,"");
System.out.println("After confirm Calling SendEmail with attachment" +errString);
if( errString != null && errString.trim().length() > 0 )
{
String begPart = errString.substring(errString.indexOf("<STATUS>")+8,errString.indexOf("</STATUS>"));
System.out.println("<STATUS> ::: " +begPart);
if("N".equalsIgnoreCase(begPart))
{
return errString;
}
else
{
errString="";
}
}
}
else
{
String begPart = errString.substring(0,errString.indexOf("<message>")+9);
String endDesc = errString.substring(errString.indexOf("</description>"));
errString= begPart+"Invalid Data"+"</message><description><![CDATA[";
errString= errString+"retString "+errString+" "+"Active this cust code Email notify flag.. "+"]]>"+endDesc;
System.out.println("mainStr:::::::::::::::::: "+errString);
}
//Added By PriyankaC to send the mail on invoice confirmation to customer on 16Oct2019.[End]
System.out.println("mainStr final error:::::::::::::::::: "+errString);
return errString;
}
}
......
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