Skip to content

B
business-java
Commit b25d2781 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@99528 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c8c3fb2e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpRmPmIC.java
View file @ b25d2781
......@@ -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 ) )
......@@ -2558,7 +2559,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
String lineNoOrd = "";
String postType="";
double quantity = 0d;
String purchaseOrder = "";
boolean asnFlag=true;
boolean purchFlag=true;
......@@ -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]
......@@ -3886,11 +3885,11 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
"WHERE PO.PURC_ORDER = PDET.PURC_ORDER "+
"AND PO.PURC_ORDER = ? "+
"AND case when item.loc_type is null then ' ' else item.loc_type end = '" + locType + "' " +
//changed by Dhanraj on 18/07/14 for unconfirmed item only.
//changed by Dhanraj on 18/07/14 for unconfirmed item only.
//"AND PDET.ITEM_CODE = ITEM.ITEM_CODE " ;
"AND PDET.ITEM_CODE = ITEM.ITEM_CODE " ;
//Commented by Manoj to Show Unscanned records in Edit mode also
//"AND PDET.LINE_NO NOT IN(SELECT LINE_NO__ORD FROM PORCPDET WHERE ASN_HDR.PURC_ORDER = PORCPDET.PURC_ORDER )";
//Commented by Manoj to Show Unscanned records in Edit mode also
//"AND PDET.LINE_NO NOT IN(SELECT LINE_NO__ORD FROM PORCPDET WHERE ASN_HDR.PURC_ORDER = PORCPDET.PURC_ORDER )";
}
pstmt = conn.prepareStatement(sql);
......@@ -3954,7 +3953,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
//ADET.SITE_CODE__MFG,ADET.SUPP_CODE__MNFR
selfLife = rs.getInt("SHELF_LIFE");
String trackShelfLife = "";
//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [start]
if(!"DDUK".equalsIgnoreCase(projectCode))
......@@ -3963,7 +3962,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
System.out.println(" trackShelfLife=================> "+trackShelfLife);
}
//Changed by Manish for Merging code DDUK and TARO on 04/12/15 [end]
siteCodeMf=checkNullAndTrim(rs.getString("SITE_CODE")); //Already from item table
System.out.println("@@@@siteCodeMf ["+siteCodeMf+"]");
/*Added By Ashish Sonawane on 03/Aug/12 for condition when maintaining lot master is true [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
......
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