Master Pack weight and Pick conf for wave status

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

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

@@ -20,6 +20,7 @@ import ibase.ejb.*;
 import ibase.system.config.*;
 import ibase.utility.BaseLogger;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
@@ -146,6 +147,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			double weight = 0.0;			
 			int noCases = 0;
 			
+			double masterPackCount  = 0.0, masterPackWeight = 0.0; // Added by sumit on 16/01/13
+			DistCommon discommon = new DistCommon(); // Added by sumit on 16/01/13
+			
 			int currentFormNo = 0, cnt = 0, count = 0;		
 
 			ConnDriver connDriver = null;
@@ -724,8 +728,13 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				}
 				
 				System.out.println(" weight ="+weight+"   no of item"+noCases);
-				if(weight > 70 || noCases > 60)
+				//Changed by sumit on 16/01/13 changing weight size as well getting these value from dispram start
+				//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 )
 				{
+				//Changed by sumit on 16/01/13 changing weight size as well getting these value from dispram end
 					errList.add( "VTWGTEXD" );
 					errFields.add( childNodeName.toLowerCase() );
 				}
@@ -1135,6 +1144,10 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 			String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
 			
+			//Changed by sumit on 16/01/13 getting site_code
+			siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "site_code" );
+			System.out.println(" site *** code ["+siteCode+"]");
+			
 			DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String dbDateFormat = genericUtility.getDBDateFormat();
 			String applDateFormat = genericUtility.getApplDateFormat();
@@ -1267,10 +1280,14 @@ 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 " +
-							" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?)";
+							//Changed by sumit on 16/01/13 adding site code in below line
+							//" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?)";
+							" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?) AND SITE.SITE_CODE = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, outerCarton);		
 					pstmt.setString(2, PTCN);
+					//Changed by sumit 16/01/13 as per sql adding site code
+					pstmt.setString(3, siteCode);
 					rs = pstmt.executeQuery();
 					//valueXmlString.append( "<Detail2 domID='1'>\r\n" );
 					valueXmlString.append("<Detail2 domID='1' selected=\"Y\">\r\n");

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

@@ -896,7 +896,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 					if(isUpdatehdr)
 					{
 							//case added by cpandey in case of active it should status should not be update in wave_task_det on 08/08/12 
-							if(!("A".equalsIgnoreCase(pickType)))
+						//if(!("A".equalsIgnoreCase(pickType)))
+					    if(!("A".equalsIgnoreCase(pickType)) && !("M".equalsIgnoreCase(pickType)))
 						{
 							//Changed by sumit on 10/08/12 update wave_status of wave_task_det, same time of updating status 'Y'
 							//updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ? ";