Chnaged the ReceiptAdvConf confirm(0 method condition and return string

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

webitm-fin/ibase/webitm/ejb/fin/GenerateReceiptPrc.java

@@ -936,7 +936,7 @@ Put a validation chq amount in filter and total of details matches in case heade
 
 		ArrayList receiptList = new ArrayList();
 		ArrayList dtl2lList = new ArrayList();
-
+		ArrayList failedTrnas = new ArrayList();
 		//java.sql.Timestamp tranDate = new java.sql.Timestamp(System.currentTimeMillis());
 		java.sql.Timestamp chgDate = new java.sql.Timestamp(System.currentTimeMillis());
 		java.sql.Timestamp dueDate = null,refDate = null;
@@ -1033,8 +1033,8 @@ conn = getConnection();
 				returnString = itmDBAccessEJB.getErrorString("","INVDT1","","",conn);
 				return returnString;
 			}
-			sdueDateTo = genericUtility.getValidDateString(sdueDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
-			dueDateTo = java.sql.Timestamp.valueOf(dueDateTo + " 00:00:00");
+			sdueDateTo = genericUtility.getValidDateString(sdueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+			dueDateTo = java.sql.Timestamp.valueOf(sdueDateTo + " 00:00:00");
 			if(procDate.before(dueDateTo))				
 			{
 				returnString= itmDBAccessEJB.getErrorString("","VTPROCDATE","","",conn);
@@ -1550,8 +1550,9 @@ conn = getConnection();
 							//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"No Of Invoice for receipt ["+tranId+"]"+invoiceList.size(),true);
 							insertReceiptDtl(tranId,invoiceList,conn);
 						}
+						//Below auto conf commented by Pavan R on 1-dec18 and added below after updateReceipt
 						//Added by Pavan R 10-may-18 to flag in filter on receivable JV creation, to create a confirmed or unconfirmed JV.
-						if("Y".equals(jvAutoConf))
+						/*if("Y".equals(jvAutoConf))
 						{	System.out.println("Pavan---Receipt tran Id ["+tranId+"]");
 							//ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf();						
 							returnString = rcpAdvConf.confirm(tranId, xtraParams, "", conn);
@@ -1560,7 +1561,13 @@ conn = getConnection();
 							  {
 								  returnString = "";
 							  }
+							  //Pavan 19dec18 start [to handle the conn on receivableJV conf]
+							  else
+							  {								  
+								  conn.rollback();
+								  return returnString;
 							  }
+						}*/
 						//Added by Pavan R 10-may-18 end
 					}
 					catch (Exception e)
@@ -1596,10 +1603,55 @@ conn = getConnection();
 						e.printStackTrace();
 						throw new ITMException(e);
 					}
+					//Changed by Pavan R on 1-dec18
+					if("Y".equals(jvAutoConf))
+					{	System.out.println("Pavan---Receipt tran Id ["+tranId+"]");
+						//ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf();						
+						returnString = rcpAdvConf.confirm(tranId, xtraParams, "", conn);
+						System.out.println("After receipt adv---->["+returnString+"]");
+						  if(returnString != null && returnString.indexOf("VTCICONF3") != -1)
+						  {
+							  returnString = "";
+						  }
+						  //Pavan 19dec18 start [to handle the conn on receivableJV conf]
+						  else
+						  {								  
+							  conn.rollback();							  
+							  failedTrnas.add(tranId);
+						  }
+					}					
+					if(returnString != null && returnString.trim().length() == 0)
+					{
 						conn.commit();
-					returnString= itmDBAccessEJB.getErrorString("","VTSUCC","","",conn); // 19/07/12 MANOHARAN
+						//returnString= itmDBAccessEJB.getErrorString("","VTSUCC","","",conn); // 19/07/12 MANOHARAN
+						returnString = itmDBAccessEJB.getErrorString("","VTSUCC","","",conn);
 						System.out.println("Transaction commited...............");
+					}
 				}//for
+				//Pavan R on 19dec18 [to display uncomfirmed transation]
+				String retString = "", mainStr = "";
+				for(int i=0;i<failedTrnas.size();i++)
+				{
+					retString=retString+failedTrnas.get(i)+",";
+				}
+				if(retString != null && retString.trim().length() > 0)
+				{
+					retString = retString.substring(0, retString.length() - 1);
+					mainStr = "\nProcess completed but following Transactions are not confirmed :"  ;
+				}else
+				{
+					mainStr = "Process completed Successfully."  ;
+				}				
+				String begPart = returnString.substring( 0, returnString.indexOf("<trace>") + 7 );
+				String endPart = returnString.substring( returnString.indexOf("</trace>"));				
+				mainStr=begPart+mainStr+retString;
+				if(mainStr.trim().length()==0)
+				{
+					mainStr = begPart;
+				}
+				mainStr = mainStr +  endPart;	
+				returnString = mainStr;
+				//Pavan 19dec18 start end			     
 		    }
 			else
 			{
@@ -1670,9 +1722,12 @@ conn = getConnection();
 			{
 				//fw.flush();
 				//fw.close();
+				if(conn != null)
+				{
 					conn.close();
 					conn = null;
 				}
+			}
 			catch(Exception se){}
 		}//
 		//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"Finally Return String"+returnString,true);