Skip to content

B
business-java
Commit 1584c30e authored by msingh's avatar msingh
Browse files
Options

Changes in PoRcpRmPmIC.java for DDUK 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99503 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c1871941
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 4 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpRmPmIC.java
View file @ 1584c30e
...@@ -3168,8 +3168,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -3168,8 +3168,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
if(asnNo != null && !asnNo.equals("")){//protect ='1' if(asnNo != null && !asnNo.equals("")){//protect ='1'
valueXmlString.append( "<tran_type protect ='1'><![CDATA[" ).append(pordType).append( "]]></tran_type>\r\n" ); valueXmlString.append( "<tran_type protect ='1'><![CDATA[" ).append(pordType).append( "]]></tran_type>\r\n" );
}else{ }else{
//Changed by Dhanraj for as per pragyan sir tran type set using gencode pophelp on 22-SEP-14 not pordtype //Changed by Manish for Merging code DDUK and TARO on 23/12/15 [START]
valueXmlString.append( "<tran_type><![CDATA[" ).append("").append( "]]></tran_type>\r\n" ); if("DDUK".equalsIgnoreCase(projectCode))
{
valueXmlString.append( "<tran_type><![CDATA[" ).append( "T" ).append( "]]></tran_type>\r\n" );
}
//Changed by Manish for Merging code DDUK and TARO on 23/12/15 [end]
else
{
//Changed by Dhanraj for as per pragyan sir tran type set using gencode pophelp on 22-SEP-14 not pordtype
valueXmlString.append( "<tran_type><![CDATA[" ).append("").append( "]]></tran_type>\r\n" );
}
} }
valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull(loginSite) ).append( "]]></site_code>\r\n" ); valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull(loginSite) ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull(siteDescr) ).append( "]]></site_descr>\r\n" ); valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull(siteDescr) ).append( "]]></site_descr>\r\n" );
...@@ -3528,18 +3537,20 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -3528,18 +3537,20 @@ 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[").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("<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("<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] //Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
if("DDUK".equalsIgnoreCase(projectCode)) if("DDUK".equalsIgnoreCase(projectCode))
{ {
valueXmlString.append("<lot_no><![CDATA[").append(" ").append("]]></lot_no>\r\n"); valueXmlString.append("<lot_no><![CDATA[").append(" ").append("]]></lot_no>\r\n");
valueXmlString.append("<lot_sl><![CDATA[").append(" ").append("]]></lot_sl>\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 else
{ {
valueXmlString.append("<lot_no><![CDATA[").append(lotNo).append("]]></lot_no>\r\n"); 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("<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] //Changed by Manish for Merging code DDUK and TARO on 04/12/15 [end]
...@@ -4235,18 +4246,20 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -4235,18 +4246,20 @@ 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("<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("<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( 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 //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] //Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
if("DDUK".equalsIgnoreCase(projectCode)) if("DDUK".equalsIgnoreCase(projectCode))
{ {
valueXmlString.append("<lot_no><![CDATA[").append( " " ).append("]]></lot_no>\r\n"); 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] //Changed by Manish for Merging code DDUK and TARO on 04/12/15 [end]
else else
{ {
valueXmlString.append("<lot_no><![CDATA[").append( checkNullAndTrim(lotNo) ).append("]]></lot_no>\r\n"); //Added By Ashish on 03/Aug/12 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( 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 valueXmlString.append("<canc_bo><![CDATA[").append( cancBoMode ).append("]]></canc_bo>\r\n");//Changed By Mahesh Patidar on 29/06/12
......
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