sales return changes in validation and item change

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

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

@@ -9,6 +9,7 @@
 package ibase.webitm.ejb.dis;
 import ibase.system.config.ConnDriver;
 import ibase.utility.E12GenericUtility;
+import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
 //import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -50,12 +51,12 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe
 	
 	public String postSave(String winName,String editFlag,String tranId,  String xtraParams,Connection conn) throws RemoteException,ITMException
 	{
-		String sql = "";
+		String sql = "",errorString="",invoiceID="";
 		//GenericUtility genericUtility = GenericUtility.getInstance();
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		
-		double taxAmtHdr = 0.0, netAmtHdr = 0.0, effNetAmtHdr = 0.0,adjAmtHdr = 0.0;
+		ITMDBAccessEJB	itmDBAccessEJB = new ITMDBAccessEJB(); //added by nandkumar gadkari on 18/09/19
+		double taxAmtHdr = 0.0, netAmtHdr = 0.0, effNetAmtHdr = 0.0,adjAmtHdr = 0.0,rate=0.0;
 		
 		try
 		{
@@ -117,6 +118,47 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe
 			pstmt.executeUpdate();
 			pstmt.close();
 			pstmt = null;
+			
+			//validation added by nandkumar gadkari on 18/09/19-----------start----------------
+			sql = "select invoice_id , rate  "
+					+ " from sreturndet where tran_id = ? ";
+				pstmt= conn.prepareStatement(sql);
+				pstmt.setString( 1, tranId );
+				rs = pstmt.executeQuery();
+				while (rs.next())
+				{
+					invoiceID = rs.getString(1);
+					rate = rs.getDouble(2);
+					
+					if(rate < 0)
+					{
+						errorString=itmDBAccessEJB.getErrorString("","VTRATE2","","",conn);
+						return errorString;
+					}
+					else
+					{
+						if( invoiceID == null || invoiceID.trim().length() == 0 )
+						{
+							
+							if ( rate == 0 )
+							{
+								errorString=itmDBAccessEJB.getErrorString("","VTRATE3","","",conn);
+								return errorString;
+							}
+							
+						}
+					}
+				
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+			
+				
+			
+			//validation added by nandkumar gadkari on 18/09/19-----------end----------------
+			
 		}
 		catch(Exception e)
 		{
@@ -135,6 +177,7 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe
 				throw new ITMException(d);
 			}
 		}
-		return "";
+		//return "";commented and added by nandkumar gadkari on 18/09/19
+		return	errorString;
 	}
  }// END OF MAIN CLASS
\ No newline at end of file

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

@@ -214,6 +214,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 		String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19
 		Timestamp trDate = null;
 		double srDQuantity =0,adjQty=0,domTotalQty=0;
+		int mrhCnt=0;// added by nandkumar gadkari on 13/09/19
 		try
 		{
 			ITMDBAccessEJB dbEjb = new ITMDBAccessEJB();
@@ -3150,7 +3151,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									
 									while(rs.next())
 									{
-										invoiceId = checkNull(rs.getString("INVOICE_ID"));
+										invoiceId = checkNullandTrim(rs.getString("INVOICE_ID"));
 										//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start---------------
 										minRateDocKey = checkNull(rs.getString("DOC_KEY"));
 										if(minRateDocKey.indexOf(invoiceId) != -1)
@@ -3418,6 +3419,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom ));
 										System.out.println("dokkk key : " +docKey);
 										System.out.println("docKey " +docKey);
+										mrhCnt=0; //added by Nandkumar Gadkari on 14/09/19
 										if(docKey.trim().length() > 0 || docKey != null )
 										{
 											System.out.println("inside dok key1 : " +docKey);
@@ -3427,7 +3429,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											rs = pstmt.executeQuery();
 											if( rs.next() )
 											{
-												invRefId = checkNull(rs.getString( "INVOICE_ID" ));
+												mrhCnt++;//added by Nandkumar Gadkari on 14/09/19
+												invRefId = checkNullandTrim(rs.getString( "INVOICE_ID" ));
 												invRefDate = checkNull(sdf.format( rs.getTimestamp( "INVOICE_DATE" )));
 												rate = rs.getDouble( "EFF_COST" );
 											}
@@ -3437,14 +3440,33 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											if( pstmt != null )
 												pstmt.close();
 											pstmt = null;
-
-											valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
+											if(mrhCnt==0)//added by Nandkumar Gadkari on 14/09/19
+											{
+												rate=0;
+												valueXmlString.append("<rate>").append("<![CDATA[" + 0 + "]]>").append("</rate>");
+												valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>");
+												valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
+												valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
+											}
+											else//added by Nandkumar Gadkari on 14/09/19
+											{
+												//valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");//commented by Nandkumar Gadkari on 14/09/19
 												valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
-											
+												System.out.println("inside dok key1 invoiceId : " +invRefId);
+												if(docKey.indexOf(invRefId) != -1)//if added by Nandkumar Gadkari on 14/09/19
+												{
+													valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");//added by Nandkumar Gadkari on 14/09/19
 													if(invRefDate != null && invRefDate.trim().length() >0)
 													{
 														valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
 													}
+												}
+												else//else added by Nandkumar Gadkari on 14/09/19
+												{
+													valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
+													valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
+												}
+											}
 											//commented set invoice id and line_no inv trace by nandkumar gadkari on 29/08/19
 										/*	//Added by Nandkumar Gadkari on 30/10/18--------start-----------for set invoice id and line_no inv trace 
 											cnt=0;
@@ -3526,6 +3548,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									}
 									else
 									{
+										rate=0;//added by Nandkumar Gadkari on 14/09/19
 										valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>");
 										valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
 										valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
@@ -6342,7 +6365,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 		StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); 
 		String errorType = "";
 		String tranType = "";
-		String invoiceRef="";//added by nandkumar gadkari on 06/09/19
+		String invoiceRef="",fullRet="";//added by nandkumar gadkari on 06/09/19
 		try
 		{
 			//Changes and Commented By Bhushan on 09-06-2016 :START
@@ -7295,6 +7318,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										errList.add( errCode );
 										errFields.add( childNodeName.toLowerCase() );
 									}
+									//added by nandkumar gadkari on 14/09/19-----start--- For 0 rate not allowed in without invoice case  
+									if ( lcRate == 0 )
+									{
+										errCode = "VTRATE3";
+										errList.add( errCode );
+										errFields.add( childNodeName.toLowerCase() );
+									}
+									//added by nandkumar gadkari on 14/09/19-----end
 								}
 								else if( lsInvoiceId.trim().length() > 0 )
 								{	
@@ -7371,6 +7402,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										errList.add( errCode );
 										errFields.add( childNodeName.toLowerCase() );
 									}
+									//added by nandkumar gadkari on 14/09/19-----start--- For 0 rate not allowed in  invoice case 
+									fullRet	  = (genericUtility.getColumnValue( "full_ret", dom1 ));
+									fullRet= fullRet== null || fullRet.trim().length() == 0 ? "N" : (fullRet).trim();
+									if(lcRate== 0)
+									{
+										
+										if(!"Y".equalsIgnoreCase(fullRet))
+										{
+											errCode = "VTINVRATE1";
+											errList.add( errCode );
+											errFields.add( childNodeName.toLowerCase() );
+										}
+										else
+										{
+											if(lcInvRate !=0)
+											{
+												errCode = "VTINVRATE1";
+												errList.add( errCode );
+												errFields.add( childNodeName.toLowerCase() );
+											}
+										}
+									
+										
+									}
+										
+									//added by nandkumar gadkari on 14/09/19-----end--- For 0 rate not allowed in  invoice case 
 								}//if isnull(ls_invoice_id) or len(trim(ls_invoice_id)) = 0
 							}//if lc_rate < 0 
 						}