Changed by wasim on 04-04-2017 for commenting validation temporary in wf val data for DUPCARTONN

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

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

@@ -126,7 +126,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 			//String tranID = "";
 			String ptcn = "";
 			String cartonNo = "";
-			
+			String pickType = "";//Added by wasim on 04-04-2017
 
 			int currentFormNo = 0, cnt = 0, count = 0;		
 
@@ -320,7 +320,12 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 					if ( "carton_no".equalsIgnoreCase( childNodeName ) )
 					{							
 						cartonNo = genericUtility.getColumnValue("carton_no", currDom );
-						ptcn = checkNull(genericUtility.getColumnValue("ptcn", hdrDom ));
+						//Changed by on 04-04-2017 wasim to parameterize pickType and taking PTCN from current DOM
+						//ptcn = checkNull(genericUtility.getColumnValue("ptcn", hdrDom ));
+						ptcn = checkNull(genericUtility.getColumnValue("ptcn", currDom ));
+						pickType = genericUtility.getColumnValue("pick_type", currDom );
+						System.out.println("@@pickType in case2["+pickType+"]");
+	
 						System.out.println(" cartonNo ["+cartonNo+"] ptcn["+ptcn+"]");
 						
 						if( cartonNo == null || cartonNo.trim().length() == 0 )
@@ -331,10 +336,24 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 						else
 						{
 							sql = "";
+							//Changed by on 04-04-2017 wasim to parameterize pickType 
+							//sql = " SELECT C.CARTON_NO, C.STATUS, C.PTCN, W.CANCEL FROM CARTON_MASTER C, WAVE_TASK W , WAVE_TASK_DET WT " +
+							//	  " WHERE C.CARTON_NO = ? AND C.CARTON_TYPE = 'C' AND W.WAVE_ID = WT.WAVE_ID AND WT.REF_ID = C.PICK_ORDER ";
 							sql = " SELECT C.CARTON_NO, C.STATUS, C.PTCN, W.CANCEL FROM CARTON_MASTER C, WAVE_TASK W , WAVE_TASK_DET WT " +
-								  " WHERE C.CARTON_NO = ? AND C.CARTON_TYPE = 'C' AND W.WAVE_ID = WT.WAVE_ID AND WT.REF_ID = C.PICK_ORDER ";							
+									  " WHERE C.CARTON_NO = ? AND C.CARTON_TYPE = ? AND W.WAVE_ID = WT.WAVE_ID AND WT.REF_ID = C.PICK_ORDER ";	
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, cartonNo);					 
+							//Changed by on 04-04-2017 wasim to parameterize pickType  [START]
+							//pstmt.setString(1, cartonNo);
+							pstmt.setString(1, cartonNo);	
+							if("A".equals(pickType))
+							{
+								pstmt.setString(2, pickType);	
+							}
+							else
+							{
+								pstmt.setString(2, "C");	
+							}
+							//Changed by on 04-04-2017 wasim to parameterize pickType  [END]
 							rs = pstmt.executeQuery();
 							if (rs.next())
 							{
@@ -418,8 +437,9 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 							rs.close();rs = null;
 							pstmt.close(); pstmt = null;
 							*/
-							
-						  ArrayList arrayList = new ArrayList(); 
+						
+						//Changed by wasim on 04-04-2017 to comment temporary [START]	
+						/*ArrayList arrayList = new ArrayList(); 
 						  arrayList = checkDuplicateCarton(allDom);
 						  Set s = new HashSet(arrayList);
 						  System.out.println("Size of arrayList ["+arrayList.size()+"]");
@@ -429,7 +449,8 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 							  	errList.add( "DUPCARTONN" );
 								errFields.add( childNodeName.toLowerCase() );
 								break;							  
-						  }
+						  }*/
+						 //Changed by wasim on 04-04-2017 to comment temporary [END]
 							
 						}
 					}