Skip to content

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

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
parent 070ead6d
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 23 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SRetPostSave.java
View file @ 7a284590
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
package ibase.webitm.ejb.dis; package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
//import ibase.webitm.utility.GenericUtility; //import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -50,12 +51,12 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe ...@@ -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 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(); //GenericUtility genericUtility = GenericUtility.getInstance();
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
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; double taxAmtHdr = 0.0, netAmtHdr = 0.0, effNetAmtHdr = 0.0,adjAmtHdr = 0.0,rate=0.0;
try try
{ {
...@@ -117,6 +118,47 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe ...@@ -117,6 +118,47 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; 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) catch(Exception e)
{ {
...@@ -135,6 +177,7 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe ...@@ -135,6 +177,7 @@ public class SRetPostSave extends ValidatorEJB implements SRetPostSaveLocal, SRe
throw new ITMException(d); throw new ITMException(d);
} }
} }
return ""; //return "";commented and added by nandkumar gadkari on 18/09/19
return errorString;
} }
}// END OF MAIN CLASS }// END OF MAIN CLASS
\ No newline at end of file
webitm-dis/src/ibase/webitm/ejb/dis/SReturnForm.java
View file @ 7a284590
...@@ -214,6 +214,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -214,6 +214,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19 String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19
Timestamp trDate = null; Timestamp trDate = null;
double srDQuantity =0,adjQty=0,domTotalQty=0; double srDQuantity =0,adjQty=0,domTotalQty=0;
int mrhCnt=0;// added by nandkumar gadkari on 13/09/19
try try
{ {
ITMDBAccessEJB dbEjb = new ITMDBAccessEJB(); ITMDBAccessEJB dbEjb = new ITMDBAccessEJB();
...@@ -3150,7 +3151,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3150,7 +3151,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
while(rs.next()) while(rs.next())
{ {
invoiceId = checkNull(rs.getString("INVOICE_ID")); invoiceId = checkNullandTrim(rs.getString("INVOICE_ID"));
//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start--------------- //ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start---------------
minRateDocKey = checkNull(rs.getString("DOC_KEY")); minRateDocKey = checkNull(rs.getString("DOC_KEY"));
if(minRateDocKey.indexOf(invoiceId) != -1) if(minRateDocKey.indexOf(invoiceId) != -1)
...@@ -3418,6 +3419,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3418,6 +3419,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom )); String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom ));
System.out.println("dokkk key : " +docKey); System.out.println("dokkk key : " +docKey);
System.out.println("docKey " +docKey); System.out.println("docKey " +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 key1 : " +docKey); System.out.println("inside dok key1 : " +docKey);
...@@ -3427,7 +3429,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3427,7 +3429,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" )));
rate = rs.getDouble( "EFF_COST" ); rate = rs.getDouble( "EFF_COST" );
} }
...@@ -3437,13 +3440,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3437,13 +3440,32 @@ 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
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>"); {
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>"); rate=0;
valueXmlString.append("<rate>").append("<![CDATA[" + 0 + "]]>").append("</rate>");
if(invRefDate != null && invRefDate.trim().length() >0) 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("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>"); //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 //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 /* //Added by Nandkumar Gadkari on 30/10/18--------start-----------for set invoice id and line_no inv trace
...@@ -3526,6 +3548,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3526,6 +3548,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
} }
else else
{ {
rate=0;//added by Nandkumar Gadkari on 14/09/19
valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>"); valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>");
valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>"); valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>"); valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
...@@ -6342,7 +6365,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -6342,7 +6365,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
String errorType = ""; String errorType = "";
String tranType = ""; String tranType = "";
String invoiceRef="";//added by nandkumar gadkari on 06/09/19 String invoiceRef="",fullRet="";//added by nandkumar gadkari on 06/09/19
try try
{ {
//Changes and Commented By Bhushan on 09-06-2016 :START //Changes and Commented By Bhushan on 09-06-2016 :START
...@@ -7295,6 +7318,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7295,6 +7318,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
errList.add( errCode ); errList.add( errCode );
errFields.add( childNodeName.toLowerCase() ); 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 ) else if( lsInvoiceId.trim().length() > 0 )
{ {
...@@ -7371,6 +7402,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7371,6 +7402,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
errList.add( errCode ); errList.add( errCode );
errFields.add( childNodeName.toLowerCase() ); 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 isnull(ls_invoice_id) or len(trim(ls_invoice_id)) = 0
}//if lc_rate < 0 }//if lc_rate < 0
} }
......
webitm-dis/src/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 7a284590
...@@ -411,6 +411,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -411,6 +411,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
ArrayList<String> dokkeyList=null; // Added by Nandkumar Gadkari on 14/09/18 ArrayList<String> dokkeyList=null; // Added by Nandkumar Gadkari on 14/09/18
String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19 String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19
boolean cpFlag = false; boolean cpFlag = false;
int mrhCnt=0;// added by nandkumar gadkari on 13/09/19
double srDQuantity =0,adjQty=0,domTotalQty=0; double srDQuantity =0,adjQty=0,domTotalQty=0;
try try
{ {
...@@ -1776,6 +1777,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -1776,6 +1777,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}*/ }*/
valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</stk_opt>"); valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</stk_opt>");
//itemchnage call added by nandkumar gadkari on 11/09/19
setNodeValue( dom, "reas_code", reasCode );
reStr = itemChanged(dom, dom1, dom2, objContext, "reas_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
reStr = reStr.substring(0,pos);
valueXmlString.append(reStr);
} // end itm_default } // end itm_default
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
...@@ -3514,7 +3524,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3514,7 +3524,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
while(rs.next()) while(rs.next())
{ {
invoiceId = checkNull(rs.getString("INVOICE_ID")); invoiceId = checkNullandTrim(rs.getString("INVOICE_ID"));
//ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start--------------- //ADDED BY NANDKUMAR GADKARI ON 21/08/19--------------start---------------
minRateDocKey = checkNull(rs.getString("DOC_KEY")); minRateDocKey = checkNull(rs.getString("DOC_KEY"));
if(minRateDocKey.indexOf(invoiceId) != -1) if(minRateDocKey.indexOf(invoiceId) != -1)
...@@ -3829,6 +3839,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3829,6 +3839,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom )); String docKey = checkNull(genericUtility.getColumnValue( "doc_key", dom ));
System.out.println("dokkk key : " +docKey); System.out.println("dokkk key : " +docKey);
System.out.println("docKey " +docKey); System.out.println("docKey " +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 key1 : " +docKey); System.out.println("inside dok key1 : " +docKey);
...@@ -3838,7 +3849,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3838,7 +3849,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" );
rate = rs.getDouble( "EFF_COST" ); rate = rs.getDouble( "EFF_COST" );
...@@ -3850,15 +3862,36 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3850,15 +3862,36 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>"); if(mrhCnt==0)//added by Nandkumar Gadkari on 14/09/19
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");// rate protected by nandkumar gadkari on 25/02/18
/*if(invRefDate != null && invRefDate.trim().length() >0)
{ {
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>"); rate=0;
}*/ valueXmlString.append("<rate>").append("<![CDATA[" + 0 + "]]>").append("</rate>");
if(invRefDateStr != null ) 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("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").append("</inv_ref_date>"); //valueXmlString.append("<invoice_ref>").append("<![CDATA["+ invRefId +"]]>").append("</invoice_ref>");//commented by Nandkumar Gadkari on 14/09/19
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");// rate protected by nandkumar gadkari on 25/02/18
/*if(invRefDate != null && invRefDate.trim().length() >0)
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ invRefDate+"]]>").append("</inv_ref_date>");
}*/
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(invRefDateStr != null )
{
valueXmlString.append("<inv_ref_date>").append("<![CDATA["+ sdf.format(invRefDateStr)+"]]>").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>");
}
} }
} }
...@@ -3868,6 +3901,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3868,6 +3901,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
else else
{ {
rate=0;//added by Nandkumar Gadkari on 14/09/19
valueXmlString.append("<rate>").append("<![CDATA[" + 0 + "]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA[" + 0 + "]]>").append("</rate>");
valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>"); valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>");
valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>"); valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
...@@ -5063,7 +5097,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5063,7 +5097,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(lsInvoiceId != null && lsInvoiceItem != null && lsInvoiceItem.trim().equals(mcode.trim() ) && lsInvoiceId.trim().length() > 0 ) if(lsInvoiceId != null && lsInvoiceItem != null && mcode !=null && lsInvoiceItem.trim().equals(mcode.trim() ) && lsInvoiceId.trim().length() > 0 )
{ {
valueXmlString.append("<stk_opt>").append("<![CDATA[" + "N" + "]]>").append("</stk_opt>"); valueXmlString.append("<stk_opt>").append("<![CDATA[" + "N" + "]]>").append("</stk_opt>");
setNodeValue( dom, "stk_opt", "N" ); setNodeValue( dom, "stk_opt", "N" );
...@@ -5607,6 +5641,33 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5607,6 +5641,33 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
System.out.println( " mvarName :1: " + mvarName ); System.out.println( " mvarName :1: " + mvarName );
//mvarValue = " "; //mvarValue = " ";
// ADDED BY NANDKUMAR GADKARI ON 13/09/19-------------------start
mreasCode = genericUtility.getColumnValue( "reas_code", dom1 ); //dw_detedit[ii_currformno].getitemstring(1,"reas_code")
sqlStr = " Select loc_code "
+" from sreturn_reason "
+" where reason_code = ? ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mreasCode );
rs = pstmt.executeQuery();
mreasonDescr = "";
if( rs.next() )
{
mvarValue = rs.getString( "loc_code" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<loc_code>").append("<![CDATA[" + mvarValue + "]]>").append("</loc_code>");
if(mvarValue == null || mvarValue.trim().length()==0 )
{
// ADDED BY NANDKUMAR GADKARI ON 13/09/19-------------------end
if( mvarName != null && mvarName.trim().length() > 0 && !"NULLFOUND".equalsIgnoreCase( mvarName ) ) if( mvarName != null && mvarName.trim().length() > 0 && !"NULLFOUND".equalsIgnoreCase( mvarName ) )
{ {
mvarValue = distCommon.getDisparams( "999999", mvarName, conn ); mvarValue = distCommon.getDisparams( "999999", mvarName, conn );
...@@ -5621,6 +5682,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5621,6 +5682,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mvarValue = genericUtility.getColumnValue( "loc_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"loc_code") mvarValue = genericUtility.getColumnValue( "loc_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"loc_code")
System.out.println( "mvarValue :6: " + mvarValue ); System.out.println( "mvarValue :6: " + mvarValue );
} }
}
mloc = " "; mloc = " ";
sqlStr = "select descr mloc, inv_stat ls_inv_stat " //into :mloc, :ls_inv_stat sqlStr = "select descr mloc, inv_stat ls_inv_stat " //into :mloc, :ls_inv_stat
+" from location " +" from location "
...@@ -5847,6 +5909,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5847,6 +5909,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mreasCode = genericUtility.getColumnValue( "reas_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"reas_code") mreasCode = genericUtility.getColumnValue( "reas_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"reas_code")
sqlStr = " Select reason_descr mreason_descr " sqlStr = " Select reason_descr mreason_descr "
+ " ,status, loc_code "////added by nandkumar gadkari on 11/09/19
+" from sreturn_reason " +" from sreturn_reason "
+" where reason_code = ? "; //:mreas_code ; +" where reason_code = ? "; //:mreas_code ;
...@@ -5859,6 +5922,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5859,6 +5922,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( rs.next() ) if( rs.next() )
{ {
mreasonDescr = rs.getString( "mreason_descr" ); mreasonDescr = rs.getString( "mreason_descr" );
//added by nandkumar gadkari on 11/09/19
status = rs.getString( "status" );
locCode = rs.getString( "loc_code" );
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -5866,6 +5932,22 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -5866,6 +5932,22 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null; pstmt = null;
valueXmlString.append("<reason_descr>").append("<![CDATA["+ mreasonDescr +"]]>").append("</reason_descr>"); valueXmlString.append("<reason_descr>").append("<![CDATA["+ mreasonDescr +"]]>").append("</reason_descr>");
//added by nandkumar gadkari on 11/09/19--------
if(status !=null && status.trim().length() > 0 && locCode!=null && locCode.trim().length() > 0)
{
valueXmlString.append("<status>").append("<![CDATA["+ status +"]]>").append("</status>");
//valueXmlString.append("<loc_code>").append("<![CDATA["+ locCode +"]]>").append("</loc_code>");
}
setNodeValue( dom, "status", status );
reStr = itemChanged(dom, dom1, dom2, objContext, "status", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
reStr = reStr.substring(0,pos);
valueXmlString.append(reStr);
} }
else if (currentColumn.trim().equals( "exp_date" ) ) else if (currentColumn.trim().equals( "exp_date" ) )
{ {
...@@ -8278,6 +8360,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8278,6 +8360,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errList.add( errCode ); errList.add( errCode );
errFields.add( childNodeName.toLowerCase() ); 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 ) else if( lsInvoiceId.trim().length() > 0 )
{ {
...@@ -8373,6 +8463,32 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8373,6 +8463,32 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
//} //}
// end 18/10/14 manoharan take care if specific lot rate < average rate // end 18/10/14 manoharan take care if specific lot rate < average rate
} }
//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 isnull(ls_invoice_id) or len(trim(ls_invoice_id)) = 0
}//if lc_rate < 0 }//if lc_rate < 0
} }
......
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