ship conf validation

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

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

@@ -531,6 +531,24 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 								pstmt.close();
 								pstmt = null;
 								
+							 //Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not start.
+							  sql = "SELECT PTCN FROM SHIP_DOCS WHERE PTCN = ? ";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, columnValue);
+								rs = pstmt.executeQuery();
+								if( rs.next() )
+								{									
+									errList.add( "VTPTCNALLX");
+									errFields.add( childNodeName.toLowerCase() );									
+								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+								//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not end
+							
+								
+								
 								// added by cpatil
 								sql = "SELECT D.TRAN_CODE  FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID AND D.CONFIRMED != 'Y' and  W.PTCN= ?  ";
 								pstmt = conn.prepareStatement(sql);
@@ -557,7 +575,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 								// end
 								
 								//Changed by sumit on 23/01/13 validating repeat ptcn start
-								arrayList = checkDuplicaterecord(dom2);
+							  arrayList = checkDuplicaterecord(dom2);
 							  Set s = new HashSet(arrayList);
 							  System.out.println("Size of arrayList ["+arrayList.size()+"]");
 							  System.out.println("Size of Set ["+s.size()+"]");								  
@@ -569,21 +587,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 							  s.clear();
 								//Changed by sumit on 23/01/13 validating repeat ptcn end
 								
-							  //Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not start.
-							  sql = "SELECT PTCN FROM SHIP_DOCS WHERE PTCN = ? ";
-								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1, columnValue);
-								rs = pstmt.executeQuery();
-								if( rs.next() )
-								{									
-									errList.add( "VTPTCNALLX");
-									errFields.add( childNodeName.toLowerCase() );									
-								}
-								rs.close();
-								rs = null;
-								pstmt.close();
-								pstmt = null;
-								//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not end
+							 
 								
 							}
 					

webitm-wms/module-resource/sql/update.sql

@@ -29367,7 +29367,7 @@ INSERT INTO MESSAGES (
  VALUES (
 	'VTPTCNALLX',
 	'Invalid PTCN Number',
-	'Entered PTCN number is already confirmed !',
+	'Entered PTCN number is already added on a shipment !',
 	'E',
 	'Y',
 	NULL,