update by sumit on 08/02/13 bug solved

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

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

@@ -144,7 +144,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			String status = "";
 			String itemCode = "";
 			String sqlInner = "";
-			double weight = 0.0;			
+			double weight = 0.0;		
+			double cartVolume = 0.0;		
+			double selectCartVolume = 0.0;	
 			int noCases = 0;
 			
 			double masterPackCount  = 0.0, masterPackWeight = 0.0; // Added by sumit on 16/01/13
@@ -668,6 +670,23 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			case 3 :
 			{
 				System.out.println("Inside case3 validation");
+				//Changed By Pragyan 21/01/13.start
+				outerCarton = checkNull(genericUtility.getColumnValue( "outer_carton_no", hdrDom ));
+				System.out.println("outerCarton["+outerCarton+"]");
+				sql = "SELECT C.PACK_CODE,(P.LENGTH * P.WIDTH * P.HEIGHT)   FROM CARTON_MASTER C,PACKING P WHERE C.CARTON_TYPE = 'M' AND C.CARTON_NO = ? AND " +
+					  " C.PACK_CODE = P.PACK_CODE ";
+				pstmt = conn.prepareStatement( sql );
+				pstmt.setString( 1, outerCarton );
+				rs = pstmt.executeQuery();
+				if( rs.next() )
+				{
+					cartVolume = rs.getDouble(2);
+				}
+				rs.close();
+				rs = null;
+				pstmt.close(); 
+				pstmt = null;
+				//Changed By Pragyan 21/01/12.end
 				parentList = allDom.getElementsByTagName( "Detail" + currentFormNo );
 				int noOfParent = parentList.getLength();
 				System.out.println("no of parent="+noOfParent);
@@ -712,13 +731,16 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 
 						System.out.println("item Code="+itemCode+"  weight ="+weight+"   no of item"+noCases);
 						noCases++;
-						sqlInner = "select gross_weight from item_lot_packsize where item_code = ? ";
+						//sqlInner = "select gross_weight from item_lot_packsize where item_code = ? ";
+						sqlInner = "select gross_weight,(length*width*height) from item_lot_packsize where item_code = ? ";
+						
 						pstmtInner = conn.prepareStatement( sqlInner );
 						pstmtInner.setString( 1,itemCode );
 						rsInner = pstmtInner.executeQuery();
 						while( rsInner.next() )
 						{
 							weight += rsInner.getDouble("gross_weight");
+							selectCartVolume += rsInner.getDouble(2);
 						}
 						rsInner.close();
 						rsInner = null;
@@ -732,7 +754,8 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				//if(weight > 70 || noCases > 60)
 				masterPackCount  = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_CASE_COUNT",conn));
 				masterPackWeight  = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT",conn));
-				if(weight > masterPackWeight || noCases > masterPackCount )
+				//if(weight > masterPackWeight || noCases > masterPackCount )
+				if(weight > masterPackWeight || selectCartVolume > cartVolume ||  noCases > masterPackCount )
 				{
 				//Changed by sumit on 16/01/13 changing weight size as well getting these value from dispram end
 					errList.add( "VTWGTEXD" );
@@ -1286,7 +1309,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 					sql = "SELECT PHDR.TRAN_ID, PHDR.TRAN_DATE, PHDR.SITE_CODE, PHDR.SALE_ORDER, PHDR.WAVE_ID, "+
 							" PHDR.CONFIRMED, PHDR.PICK_ORDER, SITE.DESCR SITE_DESCR, PIH.PALLET_NO " +							
 							" FROM PACK_HDR PHDR , SITE SITE, PICK_ISS_HDR PIH WHERE PHDR.TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?) " +
-							" AND SITE.SITE_CODE = ? AND PIH.PICK_ORDER = PHDR.PICK_ORDER ";
+							" AND PHDR.SITE_CODE = SITE.SITE_CODE AND SITE.SITE_CODE = ? AND PIH.PICK_ORDER = PHDR.PICK_ORDER ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, outerCarton);		
 					pstmt.setString(2, PTCN);
@@ -1353,18 +1376,12 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				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 ";
+				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";
 				pstmt = conn.prepareStatement(sql);
 				//Changed by sumit on 13/01/13 setting input as per sql
-				//pstmt.setString(1, tranID);
-				pstmt.setString(1, ptcn);
-				pstmt.setString(2, ptcn);				
+				pstmt.setString(1, tranID);
+				/*pstmt.setString(1, ptcn);
+				pstmt.setString(2, ptcn);		*/		
 				rs = pstmt.executeQuery();
 				//Changed by sumit on 13/01/13 showing seleted detail in case of master unpacking only 
 				//while(rs.next())