git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211602 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/src/ibase/webitm/ejb/dis/PostOrderProcess.java

@@ -1033,8 +1033,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 						{
 							if( "Y".equalsIgnoreCase(clubOrder))
 							{
-								
-								
+
+
 								sql = " select sale_order from sorder where sale_order >= ? and sale_order <= ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, fromSaleOrder);
@@ -1052,26 +1052,26 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 							{
 								soList.add(SaleOrder);
 							}
-								for (int ctr = 0; ctr < soList.size(); ctr++)
+							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()) 
 								{
-									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)
 									{
-										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);
-										}
+										errString =  sendMailonConfirm(invoiceId,fromCustCode,templateCode,userInfo,conn);
 									}
-									rs.close();
-									rs = null;
-									pstmt.close();								
 								}
+								rs.close();
+								rs = null;
+								pstmt.close();								
+							}
 							//System.out.println("errString from send mail" +errString);
 							if(errString!= null && errString.trim().length() > 0)
 							{
@@ -6579,14 +6579,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					}
 				}
 			}
-			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;