*** empty log message ***

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103642 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/PackingDetIC.java

@@ -10,8 +10,9 @@
 
 package ibase.webitm.ejb.dis;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.util.*;
 import java.rmi.RemoteException;
@@ -26,7 +27,9 @@ import javax.ejb.Stateless;
 
 public class PackingDetIC extends ValidatorEJB implements PackingDetICLocal, PackingDetICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	
+	E12GenericUtility genericUtility = new E12GenericUtility();
+	//GenericUtility genericUtility = GenericUtility.getInstance();
 
 	//method for validation
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
@@ -288,7 +291,9 @@ public class PackingDetIC extends ValidatorEJB implements PackingDetICLocal, Pac
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 07-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		try
 		{   

webitm-dis/ibase/webitm/ejb/dis/PriceList.java

@@ -718,7 +718,6 @@ public class PriceList extends ValidatorEJB implements PriceListLocal, PriceList
 					}
 						
 				}
-					errStringXml.append("</Detail1>");//Changed by nasruddin 29-sep-16 closing tag missing
 			}//switch
 			//}//for
 			int errListSize = errList.size();

webitm-dis/ibase/webitm/ejb/dis/PriceListIC.java

@@ -126,7 +126,6 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 				{
 					childNode = childNodeList.item(ctr);
 					childNodeName = childNode.getNodeName();
-					/* Comment By Nasruddin [20-SEP-16] START
 					if(childNodeName.equalsIgnoreCase("calc_method"))
 					{
 						calcMethod = genericUtility.getColumnValue("calc_method", dom);
@@ -152,17 +151,15 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 							pstmt = null;
 						}
 						
-						/*else
+						else
 						{
 							errCode = "VTCALMNUL";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
 					}
-					Comment By Nasruddin [20-SEP-16] END
-					*/
+					
 				
-					/*	Comment By Nasruddin [20-SEP-16] START
 					else if(childNodeName.equalsIgnoreCase("price_list"))
 						{
 							priceList = genericUtility.getColumnValue("price_list", dom);
@@ -214,7 +211,7 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 										
 
 							
-						}Comment By Nasruddin [20-SEP-16]  END*/
+						}
 					                                                                      
 					 if(childNodeName.equalsIgnoreCase("price_list__parent"))
 					  {
@@ -295,8 +292,8 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 				{
 					childNode = childNodeList.item(ctr);
 					childNodeName = childNode.getNodeName();
-					/* cOMMENT bY Nasruddin [20-SEP-16] START
-					 * if(childNodeName.equalsIgnoreCase("calc_method"))
+					
+					  if(childNodeName.equalsIgnoreCase("calc_method"))
 					{
 						calcMethod = genericUtility.getColumnValue("calc_method", dom);
 						if (calcMethod !=null && calcMethod.trim().length() > 0)
@@ -351,9 +348,9 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 							}                                                                        
 						}
 
-					}cOMMENT bY Nasruddin [20-SEP-16] end*/
+					}
 
-					//Changed By Nasruddin STARt [20-sep-16] START
+					
 					if(childNodeName.equalsIgnoreCase("min_qty"))
 					{
 						minQty = convertNumber(checkNullAndTrim(genericUtility.getColumnValue("min_qty", dom)));
@@ -427,7 +424,7 @@ public class PriceListIC extends ValidatorEJB implements PriceListICLocal, Price
 							errFields.add(childNodeName.toLowerCase());
 						}                                                                        
 					}
-					//Changed By Nasruddin  [20-sep-16] END
+					
 				}
 				valueXmlString.append("</Detail2>");
 				break;

webitm-dis/ibase/webitm/ejb/dis/PriceListTranConf.java

@@ -10,9 +10,10 @@ import java.sql.Timestamp;
 import java.util.Date;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 import javax.ejb.Stateless;
@@ -20,8 +21,10 @@ import javax.ejb.Stateless;
 @Stateless
 
 public class PriceListTranConf extends ActionHandlerEJB implements PriceListTranConfRemote, PriceListTranConfLocal {
-
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	
+	//changed by nasruddin 07-10-16
+	//GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 	
 	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException, ITMException {

webitm-dis/ibase/webitm/ejb/dis/PriceListTranIC.java

@@ -451,7 +451,9 @@ public class PriceListTranIC extends ValidatorEJB implements
 		Document dom1 = null;
 		Document dom2 = null;
 		String rtStr = "";
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 07-10-16
+	//	GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		System.out.println("In Itemchange String:::");
 
 		try {

webitm-dis/ibase/webitm/ejb/dis/SalesContractIC.java

@@ -18,14 +18,17 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 @Stateless
 public class SalesContractIC extends ValidatorEJB implements SalesContractICLocal, SalesContractICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	//changed by nasruddin 07-10-16
+	//GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
 		String errString = "";
@@ -1918,7 +1921,9 @@ public class SalesContractIC extends ValidatorEJB implements SalesContractICLoca
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 07-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		try
 		{   

webitm-dis/ibase/webitm/ejb/dis/SchemeApplIC.java

@@ -3,9 +3,10 @@
  * */
 package ibase.webitm.ejb.dis;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 import java.text.DateFormat;
@@ -26,7 +27,9 @@ import java.sql.Timestamp;
 
 public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, SchemeApplICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	//changed by nasruddin 05-10-16
+	//GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
 		String errString = "";
@@ -717,7 +720,9 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		String columnValue="";
 		int currentFormNo =0;

webitm-dis/ibase/webitm/ejb/dis/SiteItemIC.java

@@ -9,9 +9,10 @@
 
 package ibase.webitm.ejb.dis;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.util.*;
 import java.rmi.RemoteException;
@@ -26,7 +27,9 @@ import javax.ejb.Stateless;
 
 public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteItemICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
@@ -36,16 +39,20 @@ public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteIte
 		Document dom2 = null;
 		try
 		{
+			
 			if (xmlString != null && xmlString.trim().length() > 0 )
 			{
+				System.out.println("xmlString ["+xmlString+"]");
 				dom = parseString(xmlString);
 			}
 			if (xmlString1 != null && xmlString1.trim().length() > 0 )
 			{
+				System.out.println("xmlString ["+xmlString1+"]");
 				dom1 = parseString(xmlString1);
 			}
 			if (xmlString2 != null && xmlString2.trim().length() > 0 )
 			{
+				System.out.println("xmlString ["+xmlString2+"]");
 				dom2 = parseString(xmlString2);
 			}
 			errString = wfValData(dom, dom1, dom2, objContext, editFlag, xtraParams);
@@ -737,7 +744,8 @@ public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteIte
 				{
 					bomCode = checkNull(genericUtility.getColumnValue("bom_code", dom));
 					today = new Date();
-					suppilerSour = checkNull(genericUtility.getColumnValue("supp_sour", dom));
+					//suppilerSour = checkNull(genericUtility.getColumnValue("supp_sour", dom));
+					System.out.println("  bomCode ====>>>>>["+bomCode+"]");
 					if(bomCode != null && bomCode.trim().length() > 0)
 					{
 						sql = "select count(*) from bom where bom_code = ? and active = 'Y' and confirmed = 'Y' ";
@@ -1525,7 +1533,9 @@ public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteIte
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		try
 		{   
@@ -2404,7 +2414,7 @@ public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteIte
 	}	
 	private String checkNull(String input) 
 	{
-		if(input == null)
+		if(input == null || input.equalsIgnoreCase("null"))
 		{
 			input = "";
 		}

webitm-dis/ibase/webitm/ejb/dis/SupplierItem.java

@@ -9,8 +9,9 @@
 package ibase.webitm.ejb.dis;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.util.*;
 import java.rmi.RemoteException;
@@ -24,7 +25,9 @@ import javax.ejb.Stateless;
 
 @Stateless 
 public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,SupplierItemRemote {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{

webitm-dis/ibase/webitm/ejb/dis/TaxIC.java

@@ -9,8 +9,9 @@
 
 package ibase.webitm.ejb.dis;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.util.*;
 import java.rmi.RemoteException;
@@ -25,7 +26,9 @@ import javax.ejb.Stateless;
 
 public class TaxIC extends ValidatorEJB implements TaxICLocal, TaxICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
@@ -580,7 +583,9 @@ public class TaxIC extends ValidatorEJB implements TaxICLocal, TaxICRemote
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		try
 		{   

webitm-dis/ibase/webitm/ejb/dis/TaxRateIC.java

@@ -7,9 +7,10 @@
 package ibase.webitm.ejb.dis;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -28,7 +29,9 @@ import org.w3c.dom.NodeList;
 public class TaxRateIC extends ValidatorEJB
 implements TaxRateICLocal, TaxRateICRemote
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	//changed by nasruddin 05-10-16
+	//GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	String winName = null;
 	FinCommon finCommon = null;
 	ValidatorEJB validator = null;
@@ -511,7 +514,9 @@ implements TaxRateICLocal, TaxRateICRemote
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		//changed by nasruddin 05-10-16
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
 		try
 		{

webitm-dis/ibase/webitm/ejb/dis/TransporterModeIC.java

@@ -6,9 +6,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+//import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import javax.ejb.Stateless;
 import org.w3c.dom.Document;
@@ -19,7 +20,9 @@ import org.w3c.dom.NodeList;
 
 public class TransporterModeIC extends ValidatorEJB implements TransporterModeICRemote, TransporterModeICLocal {
 
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	//changed by nasruddin 05-10-16
+	//GenericUtility genericUtility = GenericUtility.getInstance();
+	  E12GenericUtility genericUtility = new E12GenericUtility();
 	  ITMDBAccessEJB itmdbAccessEJB = new ITMDBAccessEJB();
 	  
 	  public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams)
@@ -205,7 +208,9 @@ public class TransporterModeIC extends ValidatorEJB implements TransporterModeIC
 			Document dom1 = null;
 			Document dom2 = null;
 			String rtStr = "";
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			//changed by nasruddin 05-10-16
+			//GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
 			System.out.println("In Itemchange String:::");
 
 			try {