For parcel Picking should not update master carton no in carton master

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

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

@@ -40,7 +40,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 		String errString = "";
 		String sql = "";
 		String pickOrder = "";
-		String pickType = "";
+		String pickType = "",refSer = "";
 		String palletNo = "", locCodeTo = "";
 		System.out.println("TRAN ID FROM POST SAVE = "+tranId);
 
@@ -77,13 +77,16 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 				pickOrder = genericUtility.getColumnValueFromNode("pick_order", dom.getElementsByTagName("Detail2").item(0));
 
 				System.out.println("pick order = "+pickOrder);
-				sql = "select pick_type from pick_ord_hdr where pick_order = ?";
+				//sql = "select pick_type from pick_ord_hdr where pick_order = ?";
+				sql = "SELECT P.PICK_TYPE,W.REF_SER  FROM PICK_ORD_HDR P , WAVE_TASK_DET W WHERE  W.REF_ID = P.PICK_ORDER AND P.PICK_ORDER= ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString( 1, pickOrder );
 				rs = pstmt.executeQuery();
+				
 				if(rs.next())
 				{
 					pickType = rs.getString("pick_type");
+					refSer  = rs.getString("ref_ser");
 				}
 				rs.close(); rs = null;
 				pstmt.close(); pstmt = null;
@@ -139,8 +142,10 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 						}
 						//Changed by Rohan on 25-02-13 for updating pallet no against master pack in carton master.end
 						
+						//Changed By Pragyan 05/03/12  to update pallet no on carton master. 
 						//Update the carton master 
-						if(!"M".equalsIgnoreCase(pickType)) // 22/09/12 manoharan
+						//if(!"M".equalsIgnoreCase(pickType)) // 22/09/12 manoharan
+						if(!"M".equalsIgnoreCase(pickType) || "P-PICK".equalsIgnoreCase(refSer)) // 22/09/12 manoharan
 						{
 							sql = "UPDATE CARTON_MASTER SET STATUS = 'U', pallet_no = ? WHERE PICK_ORDER = ? and line_no__pick in (select line_no__ord from pick_iss_det where tran_id = ?) ";
 							

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

@@ -15109,7 +15109,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmtInsert.setString(10,crtnType);
 				if(refSeries.startsWith("P-PICK"))
 				{
-					pstmtInsert.setString(11,cartonNumber);
+					//Changed By Pragyan 05/03/13 to set blank for parcel pick master carton clients requirement
+					//pstmtInsert.setString(11,cartonNumber);
+					pstmtInsert.setString(11,"");
 				}
 				else
 				{