Skip to content

B
business-java
Commit adbb9233 authored by ngadkari's avatar ngadkari
Browse files
Options

Changes in with invoice case set blank inv ref and date if doc key not contains invoice id 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209139 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1c89e714
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 14 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SReturnForm.java
View file @ adbb9233
...@@ -3669,6 +3669,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3669,6 +3669,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
setNodeValue( dom, "doc_key", minRateDocKey ); setNodeValue( dom, "doc_key", minRateDocKey );
String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom )); String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom ));
System.out.println(" dok key : " +docKey); System.out.println(" dok key : " +docKey);
mrhCnt=0; //added by Nandkumar Gadkari on 14/09/19
if(docKey.trim().length() > 0 || docKey != null ) if(docKey.trim().length() > 0 || docKey != null )
{ {
System.out.println("inside dok key : " +docKey); System.out.println("inside dok key : " +docKey);
...@@ -3678,7 +3679,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3678,7 +3679,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) 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" ))); invRefDate = checkNull(sdf.format( rs.getTimestamp( "INVOICE_DATE" )));
} }
if( rs != null ) if( rs != null )
...@@ -3687,6 +3689,18 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3687,6 +3689,18 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
if( pstmt != null ) if( pstmt != null )
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
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
{
if(docKey.indexOf(invRefId) != -1)//if added by Nandkumar Gadkari on 14/09/19
{
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>"); valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
if(invRefDate != null && invRefDate.trim().length() >0) if(invRefDate != null && invRefDate.trim().length() >0)
...@@ -3694,8 +3708,18 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3694,8 +3708,18 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>"); valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
} }
} }
else
{
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>");
}
}
}
//invoiceId = null; invoiceId = null;
} }
//Added by Nandkumar Gadkatri on 23/10/2018 to check if invoice_id reference is available in Min_rate_history [End] //Added by Nandkumar Gadkatri on 23/10/2018 to check if invoice_id reference is available in Min_rate_history [End]
} }
......
webitm-dis/src/ibase/webitm/ejb/dis/SalesReturn.java
View file @ adbb9233
...@@ -4021,6 +4021,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -4021,6 +4021,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
setNodeValue( dom, "doc_key", minRateDocKey ); setNodeValue( dom, "doc_key", minRateDocKey );
String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom )); String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom ));
System.out.println(" dok key : " +docKey); System.out.println(" dok key : " +docKey);
mrhCnt=0; //added by Nandkumar Gadkari on 14/09/19
if(docKey.trim().length() > 0 || docKey != null ) if(docKey.trim().length() > 0 || docKey != null )
{ {
System.out.println("inside dok key : " +docKey); System.out.println("inside dok key : " +docKey);
...@@ -4030,7 +4031,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -4030,7 +4031,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) 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" ))); //invRefDate = checkNull(sdf.format( rs.getTimestamp( "INVOICE_DATE" )));
invRefDateStr = rs.getTimestamp( "INVOICE_DATE" ); invRefDateStr = rs.getTimestamp( "INVOICE_DATE" );
} }
...@@ -4041,6 +4043,20 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -4041,6 +4043,20 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
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
{
if(docKey.indexOf(invRefId) != -1)//if added by Nandkumar Gadkari on 14/09/19
{
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>"); valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
/*if(invRefDate != null && invRefDate.trim().length() >0) /*if(invRefDate != null && invRefDate.trim().length() >0)
{ {
...@@ -4051,6 +4067,17 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -4051,6 +4067,17 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>"); valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>");
} }
} }
else//else 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>");
}
}
}
//Set inv_ref and date [End] PriyankaC on 26 June2018 //Set inv_ref and date [End] PriyankaC on 26 June2018
invoiceId = null; invoiceId = null;
} }
......
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