Changes in PoRcpRmPmIC.java for DDUK

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

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

@@ -487,6 +487,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
 								errFields.add( childNodeName.toLowerCase() );
 
 							}
+							projectCode = disCommonObj.getDisparams("999999","PROJECT",conn);
 							//Changes by Dadaso pawar on 19/FEB/15 [Start]
 							if(!"DDUK".equalsIgnoreCase(projectCode))
 							{
@@ -1064,7 +1065,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
 					System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]");
 
 					//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
-					projectCode = disCommonObj.getDisparams("999999","PROJECT",conn);
+					
 					if("DDUK".equalsIgnoreCase(projectCode))
 					{
 						if ( "expiry_date".equalsIgnoreCase( childNodeName ) )
@@ -3537,20 +3538,18 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
 							//valueXmlString.append("<tax_amt><![CDATA[").append(rs.getDouble("TAX_AMT") ).append("]]></tax_amt>\r\n");//Commented By Mahesh Patidar on 29/06/12
 							valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>\r\n");//Changed By Mahesh Patidar on 29/06/12
 							valueXmlString.append("<net_amt><![CDATA[").append(rs.getDouble("NET_AMT")).append("]]></net_amt>\r\n");
-							//valueXmlString.append("<loc_code><![CDATA[").append(locCode).append("]]></loc_code>\r\n");
+							valueXmlString.append("<loc_code><![CDATA[").append(locCode).append("]]></loc_code>\r\n");
 
 							//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
 							if("DDUK".equalsIgnoreCase(projectCode))
 							{
 								valueXmlString.append("<lot_no><![CDATA[").append(" ").append("]]></lot_no>\r\n");
 								valueXmlString.append("<lot_sl><![CDATA[").append(" ").append("]]></lot_sl>\r\n");
-								valueXmlString.append("<loc_code><![CDATA[").append("PGRL").append("]]></loc_code>\r\n");
 							}
 							else
 							{
 								valueXmlString.append("<lot_no><![CDATA[").append(lotNo).append("]]></lot_no>\r\n");
 								valueXmlString.append("<lot_sl><![CDATA[").append(lpnNo).append("]]></lot_sl>\r\n");
-								valueXmlString.append("<loc_code><![CDATA[").append(locCode).append("]]></loc_code>\r\n");
 							}
 							//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [end]
 
@@ -4246,20 +4245,18 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
 							valueXmlString.append("<tax_amt><![CDATA[").append(rs.getDouble("TAX_AMT")).append("]]></tax_amt>\r\n");
 							valueXmlString.append("<net_amt><![CDATA[").append(netAmt).append("]]></net_amt>\r\n");
 							//valueXmlString.append("<loc_code><![CDATA[").append( checkNull(rs.getString("LOC_CODE")) ).append("]]></loc_code>\r\n"); //commented By Ashish on 03/Aug/12
-							//valueXmlString.append("<loc_code><![CDATA[").append( scanLocCode ).append("]]></loc_code>\r\n"); //Added By Ashish on 03/Aug/12
+							valueXmlString.append("<loc_code><![CDATA[").append( scanLocCode ).append("]]></loc_code>\r\n"); //Added By Ashish on 03/Aug/12
 							//valueXmlString.append("<lot_no><![CDATA[").append( checkNullAndTrim(rs.getString("LOT_NO")) ).append("]]></lot_no>\r\n"); //commented By Ashish on 03/Aug/12
 
 							//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
 							if("DDUK".equalsIgnoreCase(projectCode))
 							{
 								valueXmlString.append("<lot_no><![CDATA[").append( " " ).append("]]></lot_no>\r\n");
-								valueXmlString.append("<loc_code><![CDATA[").append("PGRL").append("]]></loc_code>\r\n");
 							}
 							//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [end]
 							else
 							{
 								valueXmlString.append("<lot_no><![CDATA[").append( checkNullAndTrim(lotNo) ).append("]]></lot_no>\r\n"); //Added By Ashish on 03/Aug/12
-								valueXmlString.append("<loc_code><![CDATA[").append( scanLocCode ).append("]]></loc_code>\r\n");
 							}
 							//valueXmlString.append("<canc_bo><![CDATA[").append( checkNull(rs.getString("CANC_BO_MODE")) ).append("]]></canc_bo>\r\n");//Commented By Mahesh Patidar on 29/06/12
 							valueXmlString.append("<canc_bo><![CDATA[").append( cancBoMode ).append("]]></canc_bo>\r\n");//Changed By Mahesh Patidar on 29/06/12