Commit b777a18e authored by dpawar's avatar dpawar

added validation for loc_code__fr (Facility code)


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97327 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ff7a2efa
...@@ -373,6 +373,15 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf ...@@ -373,6 +373,15 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
//Changes by Dadaso pawar on 20/02/15 [Start]
if(!commonWmsUtility.isValFacLocation(locCode, siteCode, conn))
{
System.out.println("inside facility........");
errList.add( "VMFACI2" ); // 'Diffrent Loc Code from location and site' (set same error Code @base)
errFields.add( childNodeName.toLowerCase() );
break;
}
//Changes by Dadaso pawar on 20/02/15 [End]
} }
/*else if ( "lpn_no".equalsIgnoreCase( childNodeName ) ) /*else if ( "lpn_no".equalsIgnoreCase( childNodeName ) )
{ {
......
...@@ -12,6 +12,7 @@ import ibase.webitm.ejb.dis.*; ...@@ -12,6 +12,7 @@ import ibase.webitm.ejb.dis.*;
import ibase.webitm.ejb.fin.*; import ibase.webitm.ejb.fin.*;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
import java.io.*; import java.io.*;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -23,6 +24,7 @@ import java.util.Date; ...@@ -23,6 +24,7 @@ import java.util.Date;
import javax.ejb.*; import javax.ejb.*;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.xml.parsers.*; import javax.xml.parsers.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import javax.xml.transform.*; import javax.xml.transform.*;
...@@ -33,7 +35,9 @@ import javax.xml.transform.stream.StreamSource; ...@@ -33,7 +35,9 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerConfigurationException;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import java.net.InetAddress; import java.net.InetAddress;
@javax.ejb.Stateless @javax.ejb.Stateless
...@@ -190,6 +194,12 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal ...@@ -190,6 +194,12 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
p = appConnect.getProperty(); p = appConnect.getProperty();
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
//Changes by Dadaso pawar on 19/FEB/15 [Start]
CommonWmsUtil commonWmsUtility =CommonWmsUtil.getInstance();
String loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginSite = loginSite == null ? "" :loginSite.trim();
System.out.println("loginSite1111---------------->>["+loginSite+"]");
//Changes by Dadaso pawar on 19/FEB/15 [End]
if ( objContext != null && objContext.trim().length() > 0 ) if ( objContext != null && objContext.trim().length() > 0 )
{ {
currentFormNo = Integer.parseInt( objContext ); currentFormNo = Integer.parseInt( objContext );
...@@ -338,6 +348,14 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal ...@@ -338,6 +348,14 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
//Changes by Dadaso pawar on 19/FEB/15 [Start]
if(!commonWmsUtility.isValFacLocation(locCode, loginSite, conn))
{
System.out.println("indise facility........");
errList.add( "VMFACI2" ); // 'Diffrent Loc Code from location and site' (set same error Code @base)
errFields.add( childNodeName.toLowerCase() );
}
//Changes by Dadaso pawar on 19/FEB/15 [End]
rsLocCode.close(); rsLocCode.close();
rsLocCode= null; rsLocCode= null;
pstmtLocCode.close(); pstmtLocCode.close();
......
...@@ -12,6 +12,7 @@ import ibase.webitm.ejb.dis.*; ...@@ -12,6 +12,7 @@ import ibase.webitm.ejb.dis.*;
import ibase.webitm.ejb.fin.*; import ibase.webitm.ejb.fin.*;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
import java.io.*; import java.io.*;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -23,6 +24,7 @@ import java.util.Date; ...@@ -23,6 +24,7 @@ import java.util.Date;
import javax.ejb.*; import javax.ejb.*;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.xml.parsers.*; import javax.xml.parsers.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import javax.xml.transform.*; import javax.xml.transform.*;
...@@ -33,7 +35,9 @@ import javax.xml.transform.stream.StreamSource; ...@@ -33,7 +35,9 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerConfigurationException;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import java.net.InetAddress; import java.net.InetAddress;
@javax.ejb.Stateless @javax.ejb.Stateless
...@@ -193,6 +197,12 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -193,6 +197,12 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
p = appConnect.getProperty(); p = appConnect.getProperty();
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
//Changes by Dadaso pawar on 19/FEB/15 [Start]
CommonWmsUtil commonWmsUtility =CommonWmsUtil.getInstance();
String loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginSite = loginSite == null ? "" :loginSite.trim();
System.out.println("loginSite1111---------------->>["+loginSite+"]");
//Changes by Dadaso pawar on 19/FEB/15 [End]
if ( objContext != null && objContext.trim().length() > 0 ) if ( objContext != null && objContext.trim().length() > 0 )
{ {
currentFormNo = Integer.parseInt( objContext ); currentFormNo = Integer.parseInt( objContext );
...@@ -202,6 +212,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -202,6 +212,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
{ {
case 1 : case 1 :
{ {
System.out.println("loginSite1111---------------->>["+loginSite+"]");
parentList = currDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = currDom.getElementsByTagName( "Detail" + currentFormNo );
childList = parentList.item( 0 ).getChildNodes(); childList = parentList.item( 0 ).getChildNodes();
noOfChilds = childList.getLength(); noOfChilds = childList.getLength();
...@@ -472,6 +483,14 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -472,6 +483,14 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
//Changes by Dadaso pawar on 19/FEB/15 [Start]
if(!commonWmsUtility.isValFacLocation(locCode, loginSite, conn))
{
System.out.println("indise facility........");
errList.add( "VMFACI2" ); // 'Diffrent Loc Code from location and site' (set same error Code @base)
errFields.add( childNodeName.toLowerCase() );
}
//Changes by Dadaso pawar on 19/FEB/15 [End]
rsLocCode.close(); rsLocCode.close();
rsLocCode= null; rsLocCode= null;
pstmtLocCode.close(); pstmtLocCode.close();
...@@ -484,6 +503,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -484,6 +503,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
break; break;
case 2 : case 2 :
{ {
System.out.println("loginSite2222---------------->>["+loginSite+"]");
parentList = currDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = currDom.getElementsByTagName( "Detail" + currentFormNo );
childList = parentList.item( 0 ).getChildNodes(); childList = parentList.item( 0 ).getChildNodes();
noOfChilds = childList.getLength(); noOfChilds = childList.getLength();
...@@ -996,6 +1016,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -996,6 +1016,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
break; break;
case 3: case 3:
{ {
System.out.println("loginSite333---------------->>["+loginSite+"]");
//Change by Dhanraj on 05-NOV-14 for get proper detail values[Detail 3 value get from currDom not from allDom]. //Change by Dhanraj on 05-NOV-14 for get proper detail values[Detail 3 value get from currDom not from allDom].
String flag="F"; String flag="F";
parentList = currDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = currDom.getElementsByTagName( "Detail" + currentFormNo );
...@@ -2568,7 +2589,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -2568,7 +2589,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
case 2: case 2:
{ {
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) ) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{ {
asnNo = genericUtility.getColumnValue( "asn_no", hdrDom ); asnNo = genericUtility.getColumnValue( "asn_no", hdrDom );
purchaseOrder = genericUtility.getColumnValue( "purc_order", hdrDom ); purchaseOrder = genericUtility.getColumnValue( "purc_order", hdrDom );
if(asnNo != null && !asnNo.equals("")){ if(asnNo != null && !asnNo.equals("")){
......
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