Skip to content

B
business-java
Commit 6fdf5aca authored by msharma's avatar msharma
Browse files
Options

Sales Return Replacement Customer series Validation Done by Kunal 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91631 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 891a8159
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 16 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 6fdf5aca
......@@ -1420,7 +1420,6 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[R]]>").append("</ret_rep_flag>");
}
}
else if ("w_salesreturn_repl".equalsIgnoreCase(winName))
{
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
......@@ -1618,10 +1617,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_env>");
}
valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</stk_opt>");
valueXmlString.append("<gross_weight>").append("<![CDATA[0]]>").append("</gross_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[0]]>").append("</net_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[0]]>").append("</tare_weight>");
} // end itm_default
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
......@@ -3666,9 +3662,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
// 29/12/11 manoharan check for null expiry date
//if( mexpDate.before( mchkDate ) )
if( mexpDate != null && mexpDate.before( mchkDate ) )
if( mexpDate.before( mchkDate ) )
{
valueXmlString.append("<status>").append("<![CDATA[" + "N" + "]]>").append("</status>");
// 22/04/10 manoharan to set the loc_code accordingly
......@@ -4851,6 +4845,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
public String wfValData(Document dom, Document dom1,Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
{
System.out.println("wfvaldata called for sales return");
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
......@@ -4866,6 +4861,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String userId = "";
String effFromStr = null;
String validUptoStr = null;
String itemSer = "";
int cnt = 0,cnt1 = 0;
int currentFormNo=0;
int childNodeListLength;
......@@ -5560,6 +5556,49 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String mtrandateStr = genericUtility.getColumnValue( "tran_date", dom1 );
mtrandate = Timestamp.valueOf(genericUtility.getValidDateString( mtrandateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
custCode = genericUtility.getColumnValue( "cust_code", dom1 );
lsRetOpt = genericUtility.getColumnValue("ret_opt", dom1);
System.out.println("5558 rep opt ="+lsRetOpt);
if(lsRetOpt.equals("R"))
{
sqlStr = "select (case when item_ser is null then ' ' else item_ser end) as item_ser from item where item_code = ?";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mVal );
rs = pstmt.executeQuery();
if( rs.next() )
{
itemSer = rs.getString(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sqlStr = "select count(*) from customer_series where item_ser = ? and cust_code = ?";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1,itemSer);
pstmt.setString(2,custCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
cnt = rs.getInt(1);
}
if( cnt == 0 )
{
errCode = "VTRELITMS";
System.out.println("error code="+errCode);
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
errCode = isItem( siteCode, mVal, "SAL", conn );
//errCode = i_nvo_gbf_func.gbf_item(msite_code,mVal,transer)
if( errCode != null && errCode.trim().length() > 0 )
......@@ -6554,9 +6593,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
mchkDate = distCommon.CalcExpiry( mtrandate, mminShlife );
// 29/12/11 manoharan
//if( ( mexpDate.before( mchkDate ) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
if( ( (mexpDate != null && mexpDate.before( mchkDate )) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
if( ( mexpDate.before( mchkDate ) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
{
errCode = "VTSRET15";
//errString = getErrorString( childNodeName, errCode, userId );
......@@ -6564,8 +6601,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
//else if( mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
else if( mexpDate != null && mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
else if( mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
{
errCode = "VTSRET16";
//errString = getErrorString( childNodeName, errCode, userId );
......@@ -6850,9 +6886,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( mminShelfLife > 0 )
{
mchkDate = distCommon.CalcExpiry( mtrandate, mminShelfLife );
// 29/12/11 manoharan check null
//if( mchkDate.after( mexpDate ) )
if( mexpDate != null && mchkDate.after( mexpDate ) )
if( mchkDate.after( mexpDate ) )
{
errCode = "VTSHELF01";
//errString = getErrorString( childNodeName, errCode, userId );
......
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