Changed by Manish on 12/03/16 for DDUK.

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

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

@@ -369,7 +369,7 @@ public class GeneShipLabelsPrc extends ProcessEJB implements GeneShipLabelsPrcLo
 					HashMap sordMap = getSordInfo(saleOrder,conn);
 					
 				//	sql = "SELECT POD.PICK_ORDER,POD.LINE_NO FROM PICK_ORD_DET POD, PICK_ISS_HDR PIH WHERE POD.PICK_ORDER = PIH.PICK_ORDER AND PIH.PTCN = ? AND POD.ITEM_CODE = ? ";
-					sql = "SELECT ITEM_CODE,PICK_ORDER,LINE_NO FROM PICK_ORD_DET  WHERE PICK_ORDER IN ( SELECT REF_ID FROM WAVE_TASK_DET  " +
+					sql = "SELECT PICK_ORDER,LINE_NO FROM PICK_ORD_DET  WHERE PICK_ORDER IN ( SELECT REF_ID FROM WAVE_TASK_DET  " +
 							"WHERE REF_SER = 'A-PICK' AND PTCN = ? AND ROWNUM = 1) AND ITEM_CODE =   ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, ptcn);
@@ -396,11 +396,12 @@ public class GeneShipLabelsPrc extends ProcessEJB implements GeneShipLabelsPrcLo
 					
 					/*errString = itmDBAccessEJB.getErrorString("","FILENFOUND","");
 					return errString;*/
-					sql = 	" SELECT CM.CARTON_NO FROM CARTON_MASTER CM, WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " +
-					" AND CM.CARTON_NO = WOD.CARTON_NO AND CM.PTCN= ? AND CM.ITEM_CODE = ? " ;
+					sql = 	"SELECT CARTON_NO FROM CARTON_MASTER  WHERE PTCN= ?  AND PICK_ORDER = ? AND LINE_NO__PICK = ?" ;
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, ptcn);
-					pstmt1.setString(2, itemCodeInput);
+					pstmt1.setString(2, pickOrder);
+					pstmt1.setString(3, lineNo);
+					
 					rs1 = pstmt1.executeQuery();
 
 					if( rs1.next())
@@ -2463,12 +2464,14 @@ public class GeneShipLabelsPrc extends ProcessEJB implements GeneShipLabelsPrcLo
 
 				if(errString != null && errString.indexOf("ERROR") != -1)
 				{
+				
 					throw new Exception();		
 				}
 
 			}
 			catch(Exception e)
 			{
+				e.printStackTrace();
 				throw new Exception();		
 			}
 		}