Changes Merging for DDWMS.

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

webitm-wms/ibase/webitm/ejb/wms/StockTransferIC.java

@@ -45,6 +45,8 @@ public class StockTransferIC extends ValidatorEJB implements StockTransferICRemo
 	/**
 	 * The method is defined without any parameter and returns blank string
 	 */
+	// Added by Manish on 05/11/15 for DDWMS merging 
+	String projectName = "";
 	public String wfValData() throws RemoteException,ITMException
 	{
 		return "";
@@ -158,7 +160,8 @@ public class StockTransferIC extends ValidatorEJB implements StockTransferICRemo
 		ArrayList errList = new ArrayList();
 		ArrayList errFields = new ArrayList();
 		ArrayList<String> invStatList = new ArrayList<String>();//Added By Dipak
-
+		// Added by Manish on 05/11/15 for DDWMS merging 
+		projectName = distCommon.getDisparams("999999","PROJECT",conn);
 		try
 		{
 
@@ -402,7 +405,9 @@ public class StockTransferIC extends ValidatorEJB implements StockTransferICRemo
 							}
 						}
 					}
-					else if ( "lpn_no".equalsIgnoreCase( childNodeName ) )
+					// Added by Manish on 05/11/15 for DDWMS merging 
+					
+					else if ( "lpn_no".equalsIgnoreCase( childNodeName ) && !"DDUK".equalsIgnoreCase(projectName) )
 					{	
 						lpnNo = genericUtility.getColumnValue( "lpn_no", currDom );
 						locCode = genericUtility.getColumnValue( "loc_code", currDom );

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -7053,7 +7053,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom));
 			System.out.println("wavetaskinsert::::::::"+remarks);		
 			//Changes by Dadaso pawar on 17/03/15 [Start]
-			if("!DDUK".equals(projectName.trim()))
+			if(!"DDUK".equals(projectName.trim()))
 			{
 				consoliRepl = checkNull(genericUtility.getColumnValue("consolidate_repl",headerDom));
 				consoliRepl = consoliRepl.trim();