Shipment process bug

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

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

@@ -124,26 +124,55 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 			
 			System.out.println(" ptcn ["+ptcn+"] shipmentId ["+shipmentId+"]");	
 			
-			if( !isConsingneeSameOfEnteredPTCN( ptcn, conn ))  // is ship consignee are same for entered ptcn
+			if( ptcn != null && ptcn.size() > 0 )
 			{
-				System.out.println(" isConsingneeSameOfAllPTCN ");
-				errString = itmDBAccessEJB.getErrorString("","INVSHIPCON","","",conn);
-				return errString;
-			}
 			
-			isSameWave = isSameWaveId(ptcn, conn);
-			System.out.println(" isSameWave ["+isSameWave+"]");
-			if( isSameWave )
-			{				
-				if( !isAllPtcnTaken(ptcn, conn))
+				if( !isConsingneeSameOfEnteredPTCN( ptcn, conn ))  // is ship consignee are same for entered ptcn
 				{
-					System.out.println(" isAllPtcnTaken ");
-					
-					System.out.println(" else sumit  ");
+					System.out.println(" isConsingneeSameOfAllPTCN ");
+					errString = itmDBAccessEJB.getErrorString("","INVSHIPCON","","",conn);
+					return errString;
+				}
+				
+				isSameWave = isSameWaveId(ptcn, conn);
+				System.out.println(" isSameWave ["+isSameWave+"]");
+				if( isSameWave )
+				{				
+					if( !isAllPtcnTaken(ptcn, conn))
+					{
+						System.out.println(" isAllPtcnTaken ");
+						
+						System.out.println(" else sumit  ");
+						ptcnAndConsingnee = getConsigneAgainstPTCN(ptcn, conn);
+						newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);						
+						System.out.println(" ptcnAndConsingnee "+ptcnAndConsingnee);
+						System.out.println(" newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);				
+						
+						Iterator iterator = ptcnAndConsingnee.keySet().iterator();
+						while(iterator.hasNext())
+						{
+							/*HashMap  tempHash = new HashMap();
+							tempHash = 	(HashMap) iterator.next();*/
+							String key = (String)iterator.next();
+							String val = (String)ptcnAndConsingnee.get(key);
+							System.out.println("key ["+key+"] and value ["+val+"]");							
+							if( newPtcnAndNewConsingnee.containsValue(val))
+							{
+								errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
+								return errString;
+							}
+						}
+						//}
+					}
+				}
+				else
+				{
+					ptcnAndConsingnee.clear();
+					newPtcnAndNewConsingnee.clear();
 					ptcnAndConsingnee = getConsigneAgainstPTCN(ptcn, conn);
 					newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);						
-					System.out.println(" ptcnAndConsingnee "+ptcnAndConsingnee);
-					System.out.println(" newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);				
+					System.out.println(" * ptcnAndConsingnee "+ptcnAndConsingnee);
+					System.out.println(" * newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);
 					
 					Iterator iterator = ptcnAndConsingnee.keySet().iterator();
 					while(iterator.hasNext())
@@ -159,31 +188,6 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 							return errString;
 						}
 					}
-					//}
-				}
-			}
-			else
-			{
-				ptcnAndConsingnee.clear();
-				newPtcnAndNewConsingnee.clear();
-				ptcnAndConsingnee = getConsigneAgainstPTCN(ptcn, conn);
-				newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);						
-				System.out.println(" * ptcnAndConsingnee "+ptcnAndConsingnee);
-				System.out.println(" * newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);
-				
-				Iterator iterator = ptcnAndConsingnee.keySet().iterator();
-				while(iterator.hasNext())
-				{
-					/*HashMap  tempHash = new HashMap();
-					tempHash = 	(HashMap) iterator.next();*/
-					String key = (String)iterator.next();
-					String val = (String)ptcnAndConsingnee.get(key);
-					System.out.println("key ["+key+"] and value ["+val+"]");							
-					if( newPtcnAndNewConsingnee.containsValue(val))
-					{
-						errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
-						return errString;
-					}
 				}
 			}
 			//errString = getErrorString("PTCN","ALLPTCNNTA","");