Skip to content

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

Changes in setting of invoice date 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@194669 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8d551a3e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 8 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 3a35dc70
......@@ -405,7 +405,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
boolean isMinHisRateSet = false;
//Added by Santosh on 16/05/2017 [End]
String invRefId = "",invRefDate="" ; //Added By PriyankaC on 14/06/2018.
String shExpDiscAppl="";// Added by Nandkumar Gadkari on 19MAR2018
String shExpDiscAppl="";
Timestamp invRefDateStr=null;// Added by Nandkumar Gadkari on 19MAR2018
ArrayList<String> dokkeyList=null; // Added by Nandkumar Gadkari on 14/09/18
try
{
......@@ -3491,7 +3492,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? "
+ " AND MRH.QUANTITY IS NOT NULL"
//+ " AND MRH.QUANTITY IS NOT NULL"
+ " GROUP BY MRH.INVOICE_ID, MRH.QUANTITY, MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE "
//+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"
......@@ -3645,7 +3646,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( rs.next() )
{
invRefId = checkNull(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" );
rate = rs.getDouble( "EFF_COST" );
}
if( rs != null )
......@@ -3657,9 +3659,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
if(invRefDate != null && invRefDate.trim().length() >0)
/*if(invRefDate != null && invRefDate.trim().length() >0)
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
}*/
if(invRefDateStr != null )
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>");
}
}
......@@ -3778,7 +3784,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( rs.next() )
{
invRefId = checkNull(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" );
}
if( rs != null )
rs.close();
......@@ -3788,9 +3795,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
if(invRefDate != null && invRefDate.trim().length() >0)
/*if(invRefDate != null && invRefDate.trim().length() >0)
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
}*/
if(invRefDateStr != null )
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>");
}
}
//Set inv_ref and date [End] PriyankaC on 26 June2018
......@@ -6156,7 +6167,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( rs.next() )
{
invRefId = checkNull(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" );
}
if( rs != null )
rs.close();
......@@ -6169,10 +6181,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");
}
if(invRefDate != null && invRefDate.trim().length() >0)
/*if(invRefDate != null && invRefDate.trim().length() >0)
{
isInvRefDateSet= true;
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
}*/
if(invRefDateStr != null )
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>");
}
}
......
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