Skip to content

B
business-java
Commit 7bd73952 authored by pchavan's avatar pchavan
Browse files
Options

Add Validation on full_ret field. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201312 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 004d0f4b
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 7bd73952
...@@ -6994,6 +6994,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -6994,6 +6994,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
//String invoiceId = ""; //Added By PriyankaC on 15JAN18. //String invoiceId = ""; //Added By PriyankaC on 15JAN18.
String retOpt = ""; String retOpt = "";
String channelPartner=""; String channelPartner="";
//Added By PriyankaC on 27MAY2019.
String fullRet = "" ,ldCurrQtyStr ="", llLineNoStr ="",convQty ="" ,CurrQty ="";
double varQuatity = 0.0,CurrQtydtl= 0.0, convCurrQty=0.0;
try try
{ {
//Changes and Commented By Bhushan on 09-06-2016 :START //Changes and Commented By Bhushan on 09-06-2016 :START
...@@ -7252,6 +7255,47 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -7252,6 +7255,47 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
} }
} }
//Added By PriyankaC on 28-MAY-2019 [Start]
if( childNodeName.equalsIgnoreCase( "full_ret" ) )
{
mVal = null;
mVal = genericUtility.getColumnValue( "invoice_id", dom );
fullRet = genericUtility.getColumnValue( "full_ret", dom );
tranId = genericUtility.getColumnValue( "tran_id", dom );
if(tranId == null || tranId.trim().length()== 0)
{
tranId = "@@@@@@@@@@" ;
}
if((mVal != null && mVal.trim().length() > 0) && "Y".equals(fullRet))
{
System.out.println("Value of mVal :" +mVal +"fullRet :" +fullRet);
sqlStr = " select Count(*) cnt from sreturn where invoice_id = ? and tran_id <> ? ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mVal );
pstmt.setString( 2, tranId );
rs = pstmt.executeQuery();
if( rs.next() )
{
cnt = rs.getInt( "cnt" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( cnt > 0 )
{
errCode = "VTSRAINV";
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
}
}
//Added By Priyankac on 28-MAY-2019. [END]
if( childNodeName.equalsIgnoreCase( "site_code" ) ) if( childNodeName.equalsIgnoreCase( "site_code" ) )
{ {
mVal = genericUtility.getColumnValue( childNodeName, dom ); //dw_edit.GetItemString(dw_edit.GetRow(),fldname) mVal = genericUtility.getColumnValue( childNodeName, dom ); //dw_edit.GetItemString(dw_edit.GetRow(),fldname)
...@@ -8634,11 +8678,16 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8634,11 +8678,16 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
lsFullRet = genericUtility.getColumnValue( "full_ret", dom );//dw_detedit[ii_currformno].getitemstring(1,"full_ret") lsFullRet = genericUtility.getColumnValue( "full_ret", dom );//dw_detedit[ii_currformno].getitemstring(1,"full_ret")
lsLotNo = genericUtility.getColumnValue( "lot_no", dom );//dw_detedit[ii_currformno].getitemstring(1,"lot_no") lsLotNo = genericUtility.getColumnValue( "lot_no", dom );//dw_detedit[ii_currformno].getitemstring(1,"lot_no")
lsLotSl = genericUtility.getColumnValue( "lot_sl", dom );//dw_detedit[ii_currformno].getitemstring(1,"lot_sl") lsLotSl = genericUtility.getColumnValue( "lot_sl", dom );//dw_detedit[ii_currformno].getitemstring(1,"lot_sl")
String ldCurrQtyStr = genericUtility.getColumnValue( "quantity__stduom", dom );//dw_detedit[ii_currformno].getitemnumber(1,fldname) ldCurrQtyStr = genericUtility.getColumnValue( "quantity__stduom", dom );//dw_detedit[ii_currformno].getitemnumber(1,fldname)
ldCurrQty = Double.parseDouble( ldCurrQtyStr == null || ldCurrQtyStr.trim().length() == 0 ? "0" : ldCurrQtyStr.trim() ); ldCurrQty = Double.parseDouble( ldCurrQtyStr == null || ldCurrQtyStr.trim().length() == 0 ? "0" : ldCurrQtyStr.trim() );
lsTranId = genericUtility.getColumnValue( "tran_id", dom );//dw_detedit[ii_currformno].getitemstring(1,"tran_id") lsTranId = genericUtility.getColumnValue( "tran_id", dom );//dw_detedit[ii_currformno].getitemstring(1,"tran_id")
String llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no", dom ) );//dw_detedit[ii_currformno].getitemnumber(1,"line_no") llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no", dom ) );//dw_detedit[ii_currformno].getitemnumber(1,"line_no")
//Added By PriyankaC on 27May2019 [START].
convQty = genericUtility.getColumnValue( "conv__qty_stduom", dom );
convCurrQty = Double.parseDouble( convQty == null || convQty.trim().length() == 0 ? "0" : convQty.trim() );
CurrQty = genericUtility.getColumnValue( "quantity", dom );
CurrQtydtl = Double.parseDouble( CurrQty == null || CurrQty.trim().length() == 0 ? "0" : CurrQty.trim() );
//Added By PriyankaC on 27May2019 [END].
if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0) if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0)
{ {
llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf(".")); llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf("."));
...@@ -8659,7 +8708,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8659,7 +8708,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
llLineNoInvtraceStr = llLineNoInvtraceStr.substring(0,llLineNoInvtraceStr.indexOf(".")); llLineNoInvtraceStr = llLineNoInvtraceStr.substring(0,llLineNoInvtraceStr.indexOf("."));
} }
llLineNoInvtrace = Integer.parseInt( llLineNoInvtraceStr == null || llLineNoInvtraceStr.trim().length() == 0 ? "0" : llLineNoInvtraceStr.trim() ); llLineNoInvtrace = Integer.parseInt( llLineNoInvtraceStr == null || llLineNoInvtraceStr.trim().length() == 0 ? "0" : llLineNoInvtraceStr.trim() );
System.out.println( " ldCurrQty :: " + ldCurrQty ); System.out.println( " ldCurrQty :: " + ldCurrQty + "CurrQtydtl : " +CurrQtydtl + "convCurrQty :" +convCurrQty);
if( ldCurrQty == 0 ) if( ldCurrQty == 0 )
{ {
errCode = "VTISS1"; errCode = "VTISS1";
...@@ -8668,6 +8717,19 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8668,6 +8717,19 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errList.add( errCode ); errList.add( errCode );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
//Added By PriyankaC on 27MAY19 [Start]
else
{
varQuatity = CurrQtydtl * convCurrQty;
System.out.println( "varQuatity :: " + varQuatity );
if(ldCurrQty != varQuatity)
{
errCode = "VTISS1";
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
}
//Added By PriyankaC on 27MAY19 [END]
System.out.println( " lsInvoiceId :val1: " + lsInvoiceId ); System.out.println( " lsInvoiceId :val1: " + lsInvoiceId );
if( lsInvoiceId != null && lsInvoiceId.trim().length() > 0 && !"null".equalsIgnoreCase( lsInvoiceId.trim() ) ) if( lsInvoiceId != null && lsInvoiceId.trim().length() > 0 && !"null".equalsIgnoreCase( lsInvoiceId.trim() ) )
{ {
...@@ -8867,7 +8929,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8867,7 +8929,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
else else
{ {
lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom ); // dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].GetRow(),"invoice_id") lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom ); // dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].GetRow(),"invoice_id")
String llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no__inv", dom ) );//dw_detedit[ii_currformno].getitemnumber(dw_detedit[ii_currformno].GetRow(),"line_no__inv") llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no__inv", dom ) );//dw_detedit[ii_currformno].getitemnumber(dw_detedit[ii_currformno].GetRow(),"line_no__inv")
if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0) if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0)
{ {
llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf(".")); llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf("."));
...@@ -9381,7 +9443,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9381,7 +9443,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{ {
mexpDate = Timestamp.valueOf(genericUtility.getValidDateString( mexpDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); mexpDate = Timestamp.valueOf(genericUtility.getValidDateString( mexpDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
String llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no", dom ) );//dw_detedit[ii_currformno].getitemnumber(1, "line_no")//Added by shahid 24/06/2009 for DI89SUN189 llLineNoStr = getNumString( genericUtility.getColumnValue( "line_no", dom ) );//dw_detedit[ii_currformno].getitemnumber(1, "line_no")//Added by shahid 24/06/2009 for DI89SUN189
if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0) if (llLineNoStr != null && llLineNoStr.indexOf(".") > 0)
{ {
llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf(".")); llLineNoStr = llLineNoStr.substring(0,llLineNoStr.indexOf("."));
......
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