changes in Purchase receipt confirm

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

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -3241,10 +3241,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									System.out.println(">>>>>>>in S & Y if useSuppLot is not Y:"+useSuppLot);
 									if ( "Y".equalsIgnoreCase(genLotAuto) || "M".equalsIgnoreCase(genLotAuto) )
 									{
-										//changes done by priyanka 
-										//change in condition
-										//!pordType.equalsIgnoreCase(jobWorkType) && !pordType.equalsIgnoreCase(subContractType to pordType.equals(jobWorkType) && !pordType.equals(subContractType
-										if ( (!pordType.equals(jobWorkType) && !pordType.equals(subContractType) ) )
+									
+										if ( (!pordType.equalsIgnoreCase(jobWorkType) && !pordType.equalsIgnoreCase(subContractType) ) )
 										{
 											lotNoRcp = qcNo;
 										}
@@ -3385,7 +3383,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						}
 					}
 					else if ( "L".equalsIgnoreCase(qcType) && "Y".equalsIgnoreCase(qcReqdSite) )
-					{
+					{   
+													
 						System.out.println(">>>>>>>In L And Y <<<<<<<<<<="+qcReqdSite);
 						sql = "SELECT (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) AS BATCH_NO, "
 							+ " LOC_CODE, UNIT__STD, "
@@ -3527,7 +3526,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									System.out.println(">>>>>>>in L & Y if useSuppLot is not Y:"+useSuppLot);
 									if ( "Y".equalsIgnoreCase(genLotAuto) || "M".equalsIgnoreCase(genLotAuto) )
 									{
-										if ( (pordType != jobWorkType) && ( pordType != subContractType) )
+										//if ( (pordType != jobWorkType) && ( pordType != subContractType) )
+										//changes done by priyanka on 15/11/14
+										if ( (!pordType.equals(jobWorkType) && !pordType.equals(subContractType) ) )
 										{
 											lotNoRcp = qcNo;
 										}