Master Pack IC

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

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

@@ -1107,6 +1107,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 		String confDate = "";
 		String pickOrder = "";
 		String outerCarton = "";
+		String objName = "";//added by sumit on 13/01/13
 		int lineNo = 0;
 		int count= 0;
 
@@ -1149,7 +1150,8 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			}
 			valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>" );
 			valueXmlString.append( editFlag ).append( "</editFlag>\r\n</Header>\r\n" );
-
+			//Changed by sumit on 12/01/13 getting obj_name start.
+			objName = getObjName(hdrDom);
 			switch ( currentFormNo )
 			{
 			case 1:
@@ -1321,12 +1323,27 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				tranID = genericUtility.getColumnValue("tran_id", allDom, "2");
 				pickOrder = genericUtility.getColumnValue("pick_order",  allDom, "2");
 				
-
-				sql = "SELECT TRAN_ID,LINE_NO, CARTON_NO,SALE_ORDER,LINE_NO__SORD,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,NO_ART FROM PACK_DET WHERE TRAN_ID = ? ORDER BY CARTON_NO";   
+				//Changed by sumit on 13/01/13 getting ptcn value
+				String ptcn = "";
+				ptcn = genericUtility.getColumnValue("ptcn",  hdrDom, "1");			
+
+				//Changed by sumit on 12/01/13 modified sql ( Getting all selected record from carton master)
+				//sql = "SELECT TRAN_ID,LINE_NO, CARTON_NO,SALE_ORDER,LINE_NO__SORD,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,NO_ART FROM PACK_DET WHERE TRAN_ID = ? ORDER BY CARTON_NO";
+				sql = " SELECT PD.TRAN_ID,PD.LINE_NO, PD.CARTON_NO, PD.SALE_ORDER, PD.LINE_NO__SORD,PD.ITEM_CODE," +
+						" PD.SITE_CODE,PD.LOC_CODE,PD.LOT_NO,PD.LOT_SL,PD.QUANTITY,PD.NO_ART " +
+						" FROM PACK_DET PD, PACK_HDR PH WHERE PD.TRAN_ID = PH.TRAN_ID " +
+						" AND PH.PTCN = ? " +
+						" AND PD.carton_no in ( select carton_no from carton_master where ptcn = ? AND STATUS ='U' )" +
+						" ORDER BY PD.CARTON_NO ";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, tranID);
+				//Changed by sumit on 13/01/13 setting input as per sql
+				//pstmt.setString(1, tranID);
+				pstmt.setString(1, ptcn);
+				pstmt.setString(2, ptcn);				
 				rs = pstmt.executeQuery();
-				while(rs.next())
+				//Changed by sumit on 13/01/13 showing seleted detail in case of master unpacking only 
+				//while(rs.next())
+				while(rs.next() && "master_repack".equalsIgnoreCase(objName))
 				{
 					//domID++;
 					domID = rs.getInt("LINE_NO");
@@ -1380,7 +1397,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				pstmt.setString(1, tranID);
 				pstmt.setString(2, tranID);
 				rs = pstmt.executeQuery();
-				while(rs.next())
+				//Changed by sumit on 13/01/13 showing un-seleted detail in case of master unpacking only 
+				//while(rs.next())
+				while(rs.next() && "master_pack".equalsIgnoreCase(objName))
 				{
 					pickOrder1 =  checkNullAndTrim(rs.getString("pick_order"));
 					lineNo1 =  checkNullAndTrim(rs.getString("line_no__pick"));
@@ -1391,9 +1410,8 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 					pstmt1 = conn.prepareStatement(sql1);
 					pstmt1.setString(1, pickOrder);
 					pstmt1.setString(2, lineNo1);
-					rs1 = pstmt1.executeQuery();
-					
-										
+					rs1 = pstmt1.executeQuery();				
+							
 					if(rs1.next())
 					{
 						
@@ -1933,4 +1951,28 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 		
 		return dataVolumeMap;
 	}
+	
+	//Changed by sumit on 12/01/13 Getting obj_name from dom start.
+	private String getObjName(Document dom) throws ITMException
+	{		
+		NodeList parentNodeList = null;		
+		int parentNodeListLength ;		
+		String objName = "";
+		try
+		{			
+			parentNodeList = dom.getElementsByTagName("Detail1");
+			parentNodeListLength = parentNodeList.getLength();				
+			for(int row = 0; row < parentNodeListLength; row++)
+			{
+				Node childNode = parentNodeList.item(row);						
+				objName = childNode.getAttributes().getNamedItem("objName").getNodeValue();										
+			}				
+		}
+		catch (Exception e)
+		{
+			throw new ITMException(e);
+		}
+		return objName;
+	}
+	//Changed by sumit on 12/01/13 Getting obj_name from dom end.
 }